Adding upstream version 4:24.2.0.upstream/4%24.2.0

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

2 files changed, 82 insertions, 0 deletions

diff --git a/sw/qa/uitest/chart/tdf138556.py b/sw/qa/uitest/chart/tdf138556.py
new file mode 100644
index 0000000000..3fc7bb1973
--- /dev/null
+++ b/sw/qa/uitest/chart/tdf138556.py
@@ -0,0 +1,44 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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 libreoffice.uno.propertyvalue import mkPropertyValues
+
+from uitest.framework import UITestCase
+
+class tdf138556( UITestCase ):
+
+    def test_stock_chart13_insert_series( self ):
+        #Start LibreOffice Writer
+        with self.ui_test.create_doc_in_start_center( "writer" ):
+
+            #Insert Chart
+            self.xUITest.executeCommand( ".uno:InsertObjectChart" )
+            xChartMainTop = self.xUITest.getTopFocusWindow()
+            xChartMain = xChartMainTop.getChild( "chart_window" )
+            xChart = xChartMain.getChild( "CID/Page=" )
+
+            #Change Chart Type to Stock 1
+            #TODO: test other subtypes
+            with self.ui_test.execute_dialog_through_action( xChart, "COMMAND", mkPropertyValues({ "COMMAND" : "DiagramType" })) as xDialog:
+                xChartType = xDialog.getChild( "charttype" )
+                xStockType = xChartType.getChild( "8" )
+                xStockType.executeAction( "SELECT", tuple())
+
+            #Insert Data Series
+            with self.ui_test.execute_dialog_through_action( xChart, "COMMAND", mkPropertyValues({ "COMMAND" : "DiagramData" }), close_button="close") as xDialog:
+                xToolbar = xDialog.getChild( "toolbar" )
+                xToolbar.executeAction( "CLICK", mkPropertyValues({ "POS" : "1" }))
+
+            #Check Number of Sequences
+            xDocument = self.ui_test.get_component()
+            nSequences = len( xDocument.FirstDiagram.
+                CoordinateSystems[0].ChartTypes[0].DataSeries[0].DataSequences )
+            self.assertEqual( nSequences, 3 )
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/sw/qa/uitest/chart/tdf149718.py b/sw/qa/uitest/chart/tdf149718.py
new file mode 100644
index 0000000000..9486355c41
--- /dev/null
+++ b/sw/qa/uitest/chart/tdf149718.py
@@ -0,0 +1,38 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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
+
+class tdf149718( UITestCase ):
+
+    def test_chart_from_table_with_merged_cells( self ):
+        with self.ui_test.create_doc_in_start_center("writer"):
+            xWriterDoc = self.xUITest.getTopFocusWindow()
+            xWriterEdit = xWriterDoc.getChild("writer_edit")
+            with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
+                formatlbinstable = xDialog.getChild("formatlbinstable")
+                entry = formatlbinstable.getChild("1")
+                entry.executeAction("SELECT", tuple())
+            xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"}))
+
+            self.xUITest.executeCommand(".uno:GoDown")
+            self.xUITest.executeCommand(".uno:CharRightSel")
+            self.xUITest.executeCommand(".uno:MergeCells")
+
+            self.xUITest.executeCommand(".uno:GoDown")
+            xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": "1"}))
+            self.xUITest.executeCommand(".uno:GoLeft")
+            self.xUITest.executeCommand(".uno:GoLeft")
+            xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": "1"}))
+            self.xUITest.executeCommand(".uno:CharRightSel")
+            with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xDialog:
+                 xDialog.getChild('Wizard')
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab: