Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 151 insertions, 0 deletions

diff --git a/sw/qa/uitest/chapterNumbering/chapterNumbering.py b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
new file mode 100644
index 000000000..02e4c3953
--- /dev/null
+++ b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
@@ -0,0 +1,113 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from uitest.debug import sleep
+from uitest.path import get_srcdir_url
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.uihelper.common import select_pos
+
+#Outline Numbering is now Chapter Numbering
+
+class WriterChapterNumbering(UITestCase):
+
+    def test_chapter_numbering_dialog(self):
+        self.ui_test.create_doc_in_start_center("writer")
+        document = self.ui_test.get_component()
+
+        self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")  #optionsdialog
+        xDialog = self.xUITest.getTopFocusWindow()
+        xPages = xDialog.getChild("pages")
+        xWriterEntry = xPages.getChild('3')                 # Writer
+        xWriterEntry.executeAction("EXPAND", tuple())
+        xWriterGeneralEntry = xWriterEntry.getChild('0')
+        xWriterGeneralEntry.executeAction("SELECT", tuple())          #General - set millimeters
+        xMetric = xDialog.getChild("metric")
+        props = {"TEXT": "Millimeter"}
+        actionProps = mkPropertyValues(props)
+        xMetric.executeAction("SELECT", actionProps)
+        xOKBtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog")
+        xDialog = self.xUITest.getTopFocusWindow()
+        xstyle = xDialog.getChild("style")
+        xnumbering = xDialog.getChild("numbering")
+        xcharstyle = xDialog.getChild("charstyle")
+        xprefix = xDialog.getChild("prefix")
+        xsuffix = xDialog.getChild("suffix")
+        xstartat = xDialog.getChild("startat")
+        xtab = xDialog.getChild("tabcontrol")
+        #second tab
+        xalignedatmf = xDialog.getChild("alignedatmf")
+        xnum2alignlb = xDialog.getChild("num2alignlb")
+        xnumfollowedbylb = xDialog.getChild("numfollowedbylb")
+        xatmf = xDialog.getChild("atmf")
+        xindentatmf = xDialog.getChild("indentatmf")
+        select_pos(xtab, "0") #first tab
+        props = {"TEXT": "Heading"}
+        actionProps = mkPropertyValues(props)
+        xstyle.executeAction("SELECT", actionProps)
+        props2 = {"TEXT": "1, 2, 3, ..."}
+        actionProps2 = mkPropertyValues(props2)
+        xnumbering.executeAction("SELECT", actionProps2)
+        props3 = {"TEXT": "Bullets"}
+        actionProps3 = mkPropertyValues(props3)
+        xcharstyle.executeAction("SELECT", actionProps3)
+        xprefix.executeAction("TYPE", mkPropertyValues({"TEXT":"A"}))
+        xsuffix.executeAction("TYPE", mkPropertyValues({"TEXT":"B"}))
+        xstartat.executeAction("UP", tuple())
+
+        select_pos(xtab, "1") #second tab Position
+        xalignedatmf.executeAction("UP", tuple())
+        props4 = {"TEXT": "Centered"}
+        actionProps4 = mkPropertyValues(props4)
+        xnum2alignlb.executeAction("SELECT", actionProps4)
+        props5 = {"TEXT": "Tab stop"}
+        actionProps5 = mkPropertyValues(props5)
+        xnumfollowedbylb.executeAction("SELECT", actionProps5)
+        xatmf.executeAction("UP", tuple())
+        xindentatmf.executeAction("UP", tuple())
+
+        xOKBtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog")
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        xstyle = xDialog.getChild("style")
+        xnumbering = xDialog.getChild("numbering")
+        xcharstyle = xDialog.getChild("charstyle")
+        xprefix = xDialog.getChild("prefix")
+        xsuffix = xDialog.getChild("suffix")
+        xstartat = xDialog.getChild("startat")
+        xtab = xDialog.getChild("tabcontrol")
+        #second tab
+        xalignedatmf = xDialog.getChild("alignedatmf")
+        xnum2alignlb = xDialog.getChild("num2alignlb")
+        xnumfollowedbylb = xDialog.getChild("numfollowedbylb")
+        xatmf = xDialog.getChild("atmf")
+        xindentatmf = xDialog.getChild("indentatmf")
+        select_pos(xtab, "0")
+        self.assertEqual(get_state_as_dict(xstyle)["SelectEntryText"], "Heading")
+        self.assertEqual(get_state_as_dict(xnumbering)["SelectEntryText"], "1, 2, 3, ...")
+        self.assertEqual(get_state_as_dict(xcharstyle)["SelectEntryText"], "Bullets")
+        self.assertEqual(get_state_as_dict(xprefix)["Text"], "A")
+        self.assertEqual(get_state_as_dict(xsuffix)["Text"], "B")
+        self.assertEqual(get_state_as_dict(xstartat)["Text"], "2")
+        select_pos(xtab, "1") #second tab Position
+        self.assertEqual(get_state_as_dict(xalignedatmf)["Text"], "0.1 mm")
+        self.assertEqual(get_state_as_dict(xnum2alignlb)["SelectEntryText"], "Centered")
+        self.assertEqual(get_state_as_dict(xnumfollowedbylb)["SelectEntryText"], "Tab stop")
+        self.assertEqual(get_state_as_dict(xatmf)["Text"], "0.1 mm")
+        self.assertEqual(get_state_as_dict(xindentatmf)["Text"], "0.1 mm")
+        xCancelBtn = xDialog.getChild("cancel")
+        self.ui_test.close_dialog_through_button(xCancelBtn)
+
+        self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/chapterNumbering/tdf123547.py b/sw/qa/uitest/chapterNumbering/tdf123547.py
new file mode 100644
index 000000000..116ac3dfe
--- /dev/null
+++ b/sw/qa/uitest/chapterNumbering/tdf123547.py
@@ -0,0 +1,38 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+import time
+from uitest.debug import sleep
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 123547 - Systematic crash after opening Tools > Chapter Numbering
+
+class tdf123547(UITestCase):
+   def test_tdf123547_numbering_dialog_crash(self):
+        writer_doc = self.ui_test.load_file(get_url_for_data_file("tdf123547.docx"))
+        document = self.ui_test.get_component()
+        xWriterDoc = self.xUITest.getTopFocusWindow()
+
+        self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog")
+        xDialog = self.xUITest.getTopFocusWindow()
+        xTabs = xDialog.getChild("tabcontrol")
+        select_pos(xTabs, "1")
+        xokbtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xokbtn)
+        #verify we didn't crash
+        self.assertEqual(document.CurrentController.PageCount, 1)
+
+        self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab: