1 files changed, 37 insertions, 39 deletions
diff --git a/sc/qa/uitest/options/tdf122977.py b/sc/qa/uitest/options/tdf122977.py
index 1ca0c1465dde..bcd97c4d3fe3 100644
--- a/sc/qa/uitest/options/tdf122977.py
+++ b/sc/qa/uitest/options/tdf122977.py
@@ -15,44 +15,42 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 
 class chartDefaultColors(UITestCase):
     def test_tdf122977_crash_chart_default_colors_options(self):
-        calc_doc = self.ui_test.create_doc_in_start_center("calc")
-        xCalcDoc = self.xUITest.getTopFocusWindow()
-        gridwin = xCalcDoc.getChild("grid_window")
-        document = self.ui_test.get_component()
-
-        #Go to Tools -> Options -> Charts -> Default Colors
-        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt:
-
-            xPages = xDialogOpt.getChild("pages")
-            xChartEntry = xPages.getChild('5')                 # Charts
-            xChartEntry.executeAction("EXPAND", tuple())
-            xChartGeneralEntry = xChartEntry.getChild('0')
-            xChartGeneralEntry.executeAction("SELECT", tuple())          #Default Colors
-            xColors = xDialogOpt.getChild("colors")
-            xAdd = xDialogOpt.getChild("add")
-            xDelete = xDialogOpt.getChild("delete")
-            xDefault = xDialogOpt.getChild("default")
-
-            #click Default - reset
-            xDefault.executeAction("CLICK", tuple())
-            nrDefaultColors = get_state_as_dict(xColors)["Children"]
-            nrDefaultColors1 = int(nrDefaultColors) + 1
-            xAdd.executeAction("CLICK", tuple())    #add new color
-            self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
-
-            #delete new color
-            with self.ui_test.execute_blocking_action(xDelete.executeAction, args=('CLICK', ()), close_button="yes"):
-                pass
-
-            self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
-
-            xAdd.executeAction("CLICK", tuple())    #add new color
-            self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
-            #click Default
-            xDefault.executeAction("CLICK", tuple())
-            self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
-
-
-        self.ui_test.close_doc()
+        with self.ui_test.create_doc_in_start_center_guarded("calc"):
+            xCalcDoc = self.xUITest.getTopFocusWindow()
+            gridwin = xCalcDoc.getChild("grid_window")
+
+            #Go to Tools -> Options -> Charts -> Default Colors
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt:
+
+                xPages = xDialogOpt.getChild("pages")
+                xChartEntry = xPages.getChild('5')                 # Charts
+                xChartEntry.executeAction("EXPAND", tuple())
+                xChartGeneralEntry = xChartEntry.getChild('0')
+                xChartGeneralEntry.executeAction("SELECT", tuple())          #Default Colors
+                xColors = xDialogOpt.getChild("colors")
+                xAdd = xDialogOpt.getChild("add")
+                xDelete = xDialogOpt.getChild("delete")
+                xDefault = xDialogOpt.getChild("default")
+
+                #click Default - reset
+                xDefault.executeAction("CLICK", tuple())
+                nrDefaultColors = get_state_as_dict(xColors)["Children"]
+                nrDefaultColors1 = int(nrDefaultColors) + 1
+                xAdd.executeAction("CLICK", tuple())    #add new color
+                self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
+
+                #delete new color
+                with self.ui_test.execute_blocking_action(xDelete.executeAction, args=('CLICK', ()), close_button="yes"):
+                    pass
+
+                self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
+
+                xAdd.executeAction("CLICK", tuple())    #add new color
+                self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
+                #click Default
+                xDefault.executeAction("CLICK", tuple())
+                self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
+
+
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: