uitest: combine execute_dialog_through_command methods

Change-Id: Iaa03d37a9ac3862b8cb08a81e37a611632433880
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118077
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

7 files changed, 7 insertions, 7 deletions

diff --git a/sc/qa/uitest/calc_tests2/dataform.py b/sc/qa/uitest/calc_tests2/dataform.py
index 8d9acb761b4c..617abfc73932 100644
--- a/sc/qa/uitest/calc_tests2/dataform.py
+++ b/sc/qa/uitest/calc_tests2/dataform.py
@@ -15,7 +15,7 @@ class dataform(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A10"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataForm", close_button="close"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataForm", close_button="close"):
             pass
 
         self.ui_test.close_doc()
diff --git a/sc/qa/uitest/calc_tests2/tdf114992.py b/sc/qa/uitest/calc_tests2/tdf114992.py
index 304ca7a8ecce..b0df0321249e 100644
--- a/sc/qa/uitest/calc_tests2/tdf114992.py
+++ b/sc/qa/uitest/calc_tests2/tdf114992.py
@@ -15,7 +15,7 @@ class tdf114992(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"):
+            with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"):
                 pass
 
             self.assertEqual(calc_doc.Sheets.getCount(), 1)
diff --git a/sc/qa/uitest/calc_tests2/tdf117367.py b/sc/qa/uitest/calc_tests2/tdf117367.py
index 8b0c3e1698da..6295ce8781a7 100644
--- a/sc/qa/uitest/calc_tests2/tdf117367.py
+++ b/sc/qa/uitest/calc_tests2/tdf117367.py
@@ -22,7 +22,7 @@ class tdf117367(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B4"}))
 
         #Right-click - Merge cells  /Select all three options
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MergeCells") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:MergeCells") as xDialog:
             xmoveCellsRadio = xDialog.getChild("move-cells-radio")
             xemptyCellsRadio = xDialog.getChild("empty-cells-radio")
             xkeepContentRadio = xDialog.getChild("keep-content-radio")
diff --git a/sc/qa/uitest/calc_tests2/tdf126577.py b/sc/qa/uitest/calc_tests2/tdf126577.py
index d8a2fda1ffbc..8eef03b9c070 100644
--- a/sc/qa/uitest/calc_tests2/tdf126577.py
+++ b/sc/qa/uitest/calc_tests2/tdf126577.py
@@ -19,7 +19,7 @@ class tdf126577(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A20"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog:
 
             self.assertEqual("true", get_state_as_dict(xDialog.getChild("down"))['Checked'])
             self.assertEqual("true", get_state_as_dict(xDialog.getChild("linear"))['Checked'])
diff --git a/sc/qa/uitest/calc_tests2/tdf37623.py b/sc/qa/uitest/calc_tests2/tdf37623.py
index a22a9fc0df45..0193186f3ea5 100644
--- a/sc/qa/uitest/calc_tests2/tdf37623.py
+++ b/sc/qa/uitest/calc_tests2/tdf37623.py
@@ -16,7 +16,7 @@ class tdf37623(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A6"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog:
                 xautofill = xDialog.getChild("autofill")
                 xautofill.executeAction("CLICK", tuple())
 
diff --git a/sc/qa/uitest/calc_tests2/tdf46138.py b/sc/qa/uitest/calc_tests2/tdf46138.py
index 0780db3d02bb..ed05962467f6 100644
--- a/sc/qa/uitest/calc_tests2/tdf46138.py
+++ b/sc/qa/uitest/calc_tests2/tdf46138.py
@@ -19,7 +19,7 @@ class tdf46138(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         self.xUITest.executeCommand(".uno:SelectColumn")
         #select 'edit'>'fill'>'series'>Starting Value '1' then "OK",
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog:
             xStart = xDialog.getChild("startValue")
             xStart.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
         self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "1")
diff --git a/sc/qa/uitest/calc_tests2/tdf51700.py b/sc/qa/uitest/calc_tests2/tdf51700.py
index a798f247e841..172705b6c57e 100644
--- a/sc/qa/uitest/calc_tests2/tdf51700.py
+++ b/sc/qa/uitest/calc_tests2/tdf51700.py
@@ -26,7 +26,7 @@ class tdf51700(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         self.xUITest.executeCommand(".uno:SelectColumn")
         # Data - Text to Columns
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog:
             xcomma = xDialog.getChild("comma")
             if (get_state_as_dict(xcomma)["Selected"]) == "false":
                 xcomma.executeAction("CLICK", tuple())