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>
author: Xisco Fauli <xiscofauli@libreoffice.org> 2021-06-29 11:44:54 +0200
committer: Xisco Fauli <xiscofauli@libreoffice.org> 2021-06-29 15:10:03 +0200
commit: 5b8a13486d3809066e663549879c209992d5479d (patch)
tree: 8c2701d8827e24eb7f36eb707c20905c41653485
parent: d0172f785a5973dbe5ea585eabfa7a4671b38775 (diff)
266 files changed, 673 insertions, 677 deletions
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py
index e2c518d18ef3..878f9e2a8ae7 100644
--- a/cui/qa/uitest/dialogs/chardlg.py
+++ b/cui/qa/uitest/dialogs/chardlg.py
@@ -25,7 +25,7 @@ class Test(UITestCase):
         self.xUITest.executeCommand(".uno:SelectAll")
 
         # Now use Format -> Character.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             # Select RID_SVXPAGE_CHAR_EFFECTS.
             select_pos(xTabs, "1")
@@ -56,7 +56,7 @@ class Test(UITestCase):
         self.xUITest.executeCommand(".uno:SelectAll")
 
         # Now use Format -> Character.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             # Select RID_SVXPAGE_CHAR_EFFECTS.
             select_pos(xTabs, "1")
@@ -82,7 +82,7 @@ class Test(UITestCase):
         editWin = doc.getChild("writer_edit")
 
         # Use Format -> Character.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             # Select RID_SVXPAGE_CHAR_EFFECTS.
             select_pos(xTabs, "1")
diff --git a/cui/qa/uitest/dialogs/pastedlg.py b/cui/qa/uitest/dialogs/pastedlg.py
index 048463286003..9248f923891d 100644
--- a/cui/qa/uitest/dialogs/pastedlg.py
+++ b/cui/qa/uitest/dialogs/pastedlg.py
@@ -26,7 +26,7 @@ class Test(UITestCase):
         self.xUITest.executeCommand(".uno:Copy")
 
         # Now use paste special to see what formats are offered.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial", close_button="cancel") as pasteSpecial:
+        with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial", close_button="cancel") as pasteSpecial:
             formats = pasteSpecial.getChild("list")
             entryCount = int(get_state_as_dict(formats)["Children"])
             items = []
diff --git a/cui/qa/uitest/dialogs/shortcuts.py b/cui/qa/uitest/dialogs/shortcuts.py
index 7f3f9337a525..261536d0694f 100644
--- a/cui/qa/uitest/dialogs/shortcuts.py
+++ b/cui/qa/uitest/dialogs/shortcuts.py
@@ -17,7 +17,7 @@ class Test(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog:
 
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py b/sc/qa/uitest/autofilter/autofilterBugs.py
index 5f344536da15..8a5250ae62c0 100644
--- a/sc/qa/uitest/autofilter/autofilterBugs.py
+++ b/sc/qa/uitest/autofilter/autofilterBugs.py
@@ -16,7 +16,7 @@ class autofilter(UITestCase):
             #autofilter exist
             self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel"):
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel"):
                 pass
 
             #autofilter still exist
@@ -35,13 +35,13 @@ class autofilter(UITestCase):
         enter_text_to_cell(xGridWindow, "B3", "d")
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"):
             pass
 
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A3"}))
         self.xUITest.executeCommand(".uno:SelectRow") #select two rows
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort"):
             pass
 
         #autofilter still exist
@@ -59,7 +59,7 @@ class autofilter(UITestCase):
 
             xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:E6"}))
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"):
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort"):
                 pass
 
             #autofilter still exist
diff --git a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
index ccfd0e36fe56..a266925f1c00 100644
--- a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
+++ b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
@@ -97,7 +97,7 @@ class tdf117276_autofilter_reset(UITestCase):
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B6"}))
 
         # 2. switch on auto-filter
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"):
             pass
 
         # autofilter still exist
diff --git a/sc/qa/uitest/autofilter/tdf126306.py b/sc/qa/uitest/autofilter/tdf126306.py
index 08ca30974354..6423760d2a60 100644
--- a/sc/qa/uitest/autofilter/tdf126306.py
+++ b/sc/qa/uitest/autofilter/tdf126306.py
@@ -34,7 +34,7 @@ class tdf126306(UITestCase):
 
         xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A15"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"):
             pass
 
         self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
diff --git a/sc/qa/uitest/autofilter/tdf140754.py b/sc/qa/uitest/autofilter/tdf140754.py
index bd488a7f80b4..1e539e93c5e8 100644
--- a/sc/qa/uitest/autofilter/tdf140754.py
+++ b/sc/qa/uitest/autofilter/tdf140754.py
@@ -16,7 +16,7 @@ class tdf140754(UITestCase):
         with self.ui_test.load_file(get_url_for_data_file("tdf140754.ods")) as calc_doc:
 
             #Make sure 'multi-threaded calculation' is enabled
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xCalcEntry = xPages.getChild('3')
diff --git a/sc/qa/uitest/autofilter/tdf36383.py b/sc/qa/uitest/autofilter/tdf36383.py
index 46bc1c915317..26003ebcf9fb 100644
--- a/sc/qa/uitest/autofilter/tdf36383.py
+++ b/sc/qa/uitest/autofilter/tdf36383.py
@@ -42,7 +42,7 @@ class tdf36383(UITestCase):
         self.assertFalse(row.getPropertyValue("IsVisible"))
 
         #row height
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -52,7 +52,7 @@ class tdf36383(UITestCase):
         self.assertFalse(row.getPropertyValue("IsVisible"))
 
         #optimal row height
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SetOptimalRowHeight"):
+        with self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight"):
             pass
 
         self.assertFalse(row.getPropertyValue("IsVisible"))
diff --git a/sc/qa/uitest/autofilter/tdf46062.py b/sc/qa/uitest/autofilter/tdf46062.py
index bc941ef0fccc..065279e686ab 100644
--- a/sc/qa/uitest/autofilter/tdf46062.py
+++ b/sc/qa/uitest/autofilter/tdf46062.py
@@ -24,7 +24,7 @@ class tdf46062(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"):
             pass
 
         gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"}))
diff --git a/sc/qa/uitest/calc_tests/CellDropDownItems.py b/sc/qa/uitest/calc_tests/CellDropDownItems.py
index def8a81a515a..ce443cda3283 100644
--- a/sc/qa/uitest/calc_tests/CellDropDownItems.py
+++ b/sc/qa/uitest/calc_tests/CellDropDownItems.py
@@ -22,7 +22,7 @@ class CellDropDownItems(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C10"}))
 
         #Open Validation Dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
 
             #Select List option
             xallow = xDialog.getChild("allow")
diff --git a/sc/qa/uitest/calc_tests/autofill.py b/sc/qa/uitest/calc_tests/autofill.py
index ee0d549fee7b..665410da2d48 100644
--- a/sc/qa/uitest/calc_tests/autofill.py
+++ b/sc/qa/uitest/calc_tests/autofill.py
@@ -19,7 +19,7 @@ class CalcAutofill(UITestCase):
             gridwin = xCalcDoc.getChild("grid_window")
             #Select cell A12 and drag the fill handle in the bottom right corner of the cell down to A18
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A12:A18"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"):
+            with self.ui_test.execute_dialog_through_command(".uno:FillSeries"):
                 pass
             #Compare with the content in the right next column
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 11).getValue(), 18.34)
@@ -31,7 +31,7 @@ class CalcAutofill(UITestCase):
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 17).getValue(), 24.34)
             #Select cell A12 and drag the fill handle in the bottom right corner of the cell up to A6
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A6:A12"}))
-            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:
                 xup = xDialog.getChild("up")
                 xincrement = xDialog.getChild("increment")
                 xup.executeAction("CLICK", tuple())
@@ -49,7 +49,7 @@ class CalcAutofill(UITestCase):
 
             #Continue with the next cells with grey background
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M12:M18"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"):
+            with self.ui_test.execute_dialog_through_command(".uno:FillSeries"):
                 pass
             #Compare with the content in the right next column
             self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40")
@@ -61,7 +61,7 @@ class CalcAutofill(UITestCase):
             self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 17).getString(), "12abc46")
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M6:M12"}))
-            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:
                 xup = xDialog.getChild("up")
                 xincrement = xDialog.getChild("increment")
                 xup.executeAction("CLICK", tuple())
@@ -78,7 +78,7 @@ class CalcAutofill(UITestCase):
             self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40")
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P12:P18"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"):
+            with self.ui_test.execute_dialog_through_command(".uno:FillSeries"):
                 pass
             #Compare with the content in the right next column
             self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 11).getString(), "10.64.127.7")
@@ -90,7 +90,7 @@ class CalcAutofill(UITestCase):
             self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 17).getString(), "10.64.127.13")
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P6:P12"}))
-            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:
                 xup = xDialog.getChild("up")
                 xincrement = xDialog.getChild("increment")
                 xup.executeAction("CLICK", tuple())
@@ -114,7 +114,7 @@ class CalcAutofill(UITestCase):
         enter_text_to_cell(gridwin, "A1", "1st")
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B2"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A3"}))
-        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())
         self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "1st")
diff --git a/sc/qa/uitest/calc_tests/calcSheetDelete.py b/sc/qa/uitest/calc_tests/calcSheetDelete.py
index b52dc67e3dae..c3e28bee2d0c 100644
--- a/sc/qa/uitest/calc_tests/calcSheetDelete.py
+++ b/sc/qa/uitest/calc_tests/calcSheetDelete.py
@@ -22,12 +22,12 @@ class calcSheetDelete(UITestCase):
         xGridWindow.executeAction("SELECT", mkPropertyValues({"CELL": "L12"}))
         nrSheets = document.Sheets.getCount()  #default number
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
 
         self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
 
-        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
         xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
         xToolkit.processEventsToIdle()
@@ -47,10 +47,10 @@ class calcSheetDelete(UITestCase):
 
         nrSheets = document.Sheets.getCount()  #default number of sheets
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
         xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
         xToolkit.processEventsToIdle()
@@ -60,7 +60,7 @@ class calcSheetDelete(UITestCase):
         xGridWindow = xCalcDoc.getChild("grid_window")
         enter_text_to_cell(xGridWindow, "B2", "abcd")
 
-        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(document.Sheets.getCount(), nrSheets + 1)
@@ -81,7 +81,7 @@ class calcSheetDelete(UITestCase):
         nrSheets = document.Sheets.getCount()  #default number
         i = 0
         while i < 6:
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+            with self.ui_test.execute_dialog_through_command(".uno:Insert"):
                 pass
             i = i + 1
         self.assertEqual(document.Sheets.getCount(), nrSheets + 6)
@@ -91,7 +91,7 @@ class calcSheetDelete(UITestCase):
             self.xUITest.executeCommand(".uno:JumpToNextTableSel")  #select next sheet
             i = i + 1
 
-        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
 
         xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
@@ -114,7 +114,7 @@ class calcSheetDelete(UITestCase):
         nrSheets = document.Sheets.getCount()  #default number
         i = 0
         while i < 100:
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+            with self.ui_test.execute_dialog_through_command(".uno:Insert"):
                 pass
             i = i + 1
         xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
@@ -126,7 +126,7 @@ class calcSheetDelete(UITestCase):
             self.xUITest.executeCommand(".uno:JumpToNextTableSel")  #select next sheet
             i = i + 1
 
-        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(document.Sheets.getCount(), nrSheets)
diff --git a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
index e41871b135b2..129488b50feb 100644
--- a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
+++ b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
@@ -22,7 +22,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Numbers
             # click on color btn
@@ -148,7 +148,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
         #select cell A5
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Numbers
             # click on color btn
@@ -177,7 +177,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
         #select cell D3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D3"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Numbers
             # click on color btn
diff --git a/sc/qa/uitest/calc_tests/columns.py b/sc/qa/uitest/calc_tests/columns.py
index ff1afd948caf..2466366762c1 100644
--- a/sc/qa/uitest/calc_tests/columns.py
+++ b/sc/qa/uitest/calc_tests/columns.py
@@ -21,7 +21,7 @@ class CalcColumns(UITestCase):
         #select A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #column width
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xdefault = xDialog.getChild("default")
             self.assertEqual(get_state_as_dict(xdefault)["Selected"], "true")  #default selected
@@ -40,7 +40,7 @@ class CalcColumns(UITestCase):
             xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"}))
             # Click Ok
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth", close_button="cancel") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -57,7 +57,7 @@ class CalcColumns(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1", "EXTEND":"1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xdefault = xDialog.getChild("default")
             #write your own value
@@ -67,12 +67,12 @@ class CalcColumns(UITestCase):
             # Click Ok
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -89,7 +89,7 @@ class CalcColumns(UITestCase):
         #select A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #column width
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -105,7 +105,7 @@ class CalcColumns(UITestCase):
         self.xUITest.executeCommand(".uno:Paste")
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -172,7 +172,7 @@ class CalcColumns(UITestCase):
         #select C1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"}))
         #column width
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -181,7 +181,7 @@ class CalcColumns(UITestCase):
         #select D1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"}))
         #column width
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -190,7 +190,7 @@ class CalcColumns(UITestCase):
         #select E1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E1"}))
         #column width
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -203,32 +203,32 @@ class CalcColumns(UITestCase):
         self.xUITest.executeCommand(".uno:InsertColumnsBefore")
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "2.0003 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "3.0004 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "F1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "G1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "2.0003 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "H1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "3.0004 cm")
 
diff --git a/sc/qa/uitest/calc_tests/formatCells.py b/sc/qa/uitest/calc_tests/formatCells.py
index 4d4df4ac8f26..f0a6d7e0b0cc 100644
--- a/sc/qa/uitest/calc_tests/formatCells.py
+++ b/sc/qa/uitest/calc_tests/formatCells.py
@@ -21,7 +21,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")  #tab Numbers
             xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
@@ -45,7 +45,7 @@ class formatCell(UITestCase):
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")  #tab Numbers
             xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
@@ -76,7 +76,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")  #tab Font
             xSizeFont = xDialog.getChild("westsizelb-cjk")
@@ -99,7 +99,7 @@ class formatCell(UITestCase):
         #Verify - select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")  #tab Font
             xSizeFont = xDialog.getChild("westsizelb-cjk")
@@ -128,7 +128,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")  #tab Font Effects
             xRelief = xDialog.getChild("relieflb")
@@ -148,7 +148,7 @@ class formatCell(UITestCase):
         #Verify- select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -177,7 +177,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")  #tab Alignment
             comboboxHorzAlign = xDialog.getChild("comboboxHorzAlign")
@@ -199,7 +199,7 @@ class formatCell(UITestCase):
         #Verify- select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")
             comboboxHorzAlign = xDialog.getChild("comboboxHorzAlign")
@@ -228,7 +228,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")  #tab Asian typography
             xcheckForbidList = xDialog.getChild("checkForbidList")
@@ -236,7 +236,7 @@ class formatCell(UITestCase):
         #Verify- select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xcheckForbidList = xDialog.getChild("checkForbidList")
@@ -257,7 +257,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")  #tab Borders
 
@@ -307,7 +307,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")  #tab Borders
             xsync = xDialog.getChild("sync")
@@ -337,7 +337,7 @@ class formatCell(UITestCase):
         # Verify select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")  #tab Borders
             xsync = xDialog.getChild("sync")
@@ -364,7 +364,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Cell protection
             xcheckHideFormula = xDialog.getChild("checkHideFormula")
@@ -378,7 +378,7 @@ class formatCell(UITestCase):
         # Verify select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Borders
             xcheckHideFormula = xDialog.getChild("checkHideFormula")
@@ -400,7 +400,7 @@ class formatCell(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")  #tab Alignment
             xspinDegrees = xDialog.getChild("spinDegrees")
diff --git a/sc/qa/uitest/calc_tests/mergedRowsColumns.py b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
index f0c6b5ba9ac2..a33fb44c7580 100644
--- a/sc/qa/uitest/calc_tests/mergedRowsColumns.py
+++ b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
@@ -64,7 +64,7 @@ class mergedRowsColumns(UITestCase):
 
             #move the content of the hidden cells into the first cell
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("move-cells-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2 3")
@@ -76,7 +76,7 @@ class mergedRowsColumns(UITestCase):
 
             #keep the contents of the hidden cells
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("keep-content-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2")
@@ -89,7 +89,7 @@ class mergedRowsColumns(UITestCase):
 
             #Empty the contents of the hidden cells
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("move-cells-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2 3")
@@ -102,7 +102,7 @@ class mergedRowsColumns(UITestCase):
 
             #A21-A22
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A21:A22"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("keep-content-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 20).getString(), "2")
@@ -115,7 +115,7 @@ class mergedRowsColumns(UITestCase):
 
             #A30-A32
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A30:A32"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("keep-content-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 31).getString(), "thisisbad")
@@ -126,7 +126,7 @@ class mergedRowsColumns(UITestCase):
 
             #J12-K12
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "J12:K12"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
 
                 xMoveCells = xDialog.getChild("keep-content-radio")
                 xMoveCells.executeAction("CLICK", tuple())
@@ -139,7 +139,7 @@ class mergedRowsColumns(UITestCase):
 
             #J22-K22
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "J22:K22"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog:
                 xMoveCells = xDialog.getChild("keep-content-radio")
                 xMoveCells.executeAction("CLICK", tuple())
             self.assertEqual(get_cell_by_position(calc_doc, 0, 9, 21).getString(), "2")
diff --git a/sc/qa/uitest/calc_tests/printRange.py b/sc/qa/uitest/calc_tests/printRange.py
index bdd85a81749a..c58469e032e7 100644
--- a/sc/qa/uitest/calc_tests/printRange.py
+++ b/sc/qa/uitest/calc_tests/printRange.py
@@ -93,7 +93,7 @@ class printRange(UITestCase):
         self.ui_test.close_dialog_through_button(xOK)
 
         #Copy sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move"):
+        with self.ui_test.execute_dialog_through_command(".uno:Move"):
             pass
         #Verify Print Range dialog on new sheet
         self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea")
diff --git a/sc/qa/uitest/calc_tests/rows.py b/sc/qa/uitest/calc_tests/rows.py
index 8b1c47efb840..37810b80241a 100644
--- a/sc/qa/uitest/calc_tests/rows.py
+++ b/sc/qa/uitest/calc_tests/rows.py
@@ -21,7 +21,7 @@ class CalcRows(UITestCase):
         #select A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #row height
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             xdefault = xDialog.getChild("default")
             self.assertEqual(get_state_as_dict(xdefault)["Selected"], "true")  #default selected
@@ -40,7 +40,7 @@ class CalcRows(UITestCase):
             xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"}))
             # Click Ok
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight", close_button="cancel") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -57,7 +57,7 @@ class CalcRows(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3", "EXTEND":"1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             xdefault = xDialog.getChild("default")
             #write your own value
@@ -67,12 +67,12 @@ class CalcRows(UITestCase):
             # Click Ok
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -90,7 +90,7 @@ class CalcRows(UITestCase):
         #select A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #row height
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -106,7 +106,7 @@ class CalcRows(UITestCase):
         self.xUITest.executeCommand(".uno:Paste")
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
@@ -173,7 +173,7 @@ class CalcRows(UITestCase):
         #select A3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
         #row height
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -187,12 +187,12 @@ class CalcRows(UITestCase):
 
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A4"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog:
             xvalue = xDialog.getChild("value")
             self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm")
 
diff --git a/sc/qa/uitest/calc_tests/sheetRename.py b/sc/qa/uitest/calc_tests/sheetRename.py
index 8c54ee098909..41d28583da02 100644
--- a/sc/qa/uitest/calc_tests/sheetRename.py
+++ b/sc/qa/uitest/calc_tests/sheetRename.py
@@ -14,11 +14,11 @@ class sheetRename(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
             xname_entry = xDialog.getChild("name_entry")
             xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"}))
         #Verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenameTable", close_button="cancel") as xDialog:
             xname_entry = xDialog.getChild("name_entry")
             self.assertEqual(get_state_as_dict(xname_entry)["Text"], "NewName")
 
@@ -29,7 +29,7 @@ class sheetRename(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable", close_button="") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenameTable", close_button="") as xDialog:
             xname_entry = xDialog.getChild("name_entry")
             nameVal = get_state_as_dict(xname_entry)["Text"]
             xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName**"}))
@@ -42,7 +42,7 @@ class sheetRename(UITestCase):
             self.ui_test.close_dialog_through_button(xCancelBtn)
 
         #Verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
             xname_entry = xDialog.getChild("name_entry")
             self.assertEqual(get_state_as_dict(xname_entry)["Text"], nameVal)
 
diff --git a/sc/qa/uitest/calc_tests/zoom.py b/sc/qa/uitest/calc_tests/zoom.py
index d1a8f0853356..6a0fd1670e06 100644
--- a/sc/qa/uitest/calc_tests/zoom.py
+++ b/sc/qa/uitest/calc_tests/zoom.py
@@ -22,18 +22,18 @@ class calcZoom(UITestCase):
         self.assertEqual(get_state_as_dict(gridwin)["Zoom"], "100")
 
         #dialog View-Zoom-Zoom
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
 
             #select fit weight & height - OK - open and verify
             fitwandh = xDialog.getChild("fitwandh")
             fitwandh.executeAction("CLICK",tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             #select fit weight - OK - open and verify
             fitw = xDialog.getChild("fitw")
             fitw.executeAction("CLICK",tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             #select 100% & Automatic - OK - open and verify
             x100pc = xDialog.getChild("100pc")
             x100pc.executeAction("CLICK", tuple())
@@ -43,7 +43,7 @@ class calcZoom(UITestCase):
         gridwin.executeAction("SET", mkPropertyValues({"ZOOM": "103"}))
         self.assertEqual(get_state_as_dict(gridwin)["Zoom"], "103")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             #select variable option and make zoom 100% again - OK - open and verify
             zoomsb = xDialog.getChild("zoomsb")
             self.assertEqual(get_state_as_dict(zoomsb)["Text"], "103%")
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())
diff --git a/sc/qa/uitest/calc_tests3/clearCells.py b/sc/qa/uitest/calc_tests3/clearCells.py
index 91db83d5262c..49cd1dab059c 100644
--- a/sc/qa/uitest/calc_tests3/clearCells.py
+++ b/sc/qa/uitest/calc_tests3/clearCells.py
@@ -22,7 +22,7 @@ class clearCells(UITestCase):
         enter_text_to_cell(gridwin, "A2", "1")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -64,7 +64,7 @@ class clearCells(UITestCase):
         enter_text_to_cell(gridwin, "A2", "1")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -106,7 +106,7 @@ class clearCells(UITestCase):
         enter_text_to_cell(gridwin, "A2", "1")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -147,7 +147,7 @@ class clearCells(UITestCase):
         enter_text_to_cell(gridwin, "A2", "=A1+1")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -190,7 +190,7 @@ class clearCells(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
         self.xUITest.executeCommand(".uno:Bold")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -219,7 +219,7 @@ class clearCells(UITestCase):
 
         #Verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")  #tab Font
 
@@ -242,7 +242,7 @@ class clearCells(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
         self.xUITest.executeCommand(".uno:Bold")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
             xtext = xDialog.getChild("text")
             xdatetime = xDialog.getChild("datetime")
@@ -270,7 +270,7 @@ class clearCells(UITestCase):
         enter_text_to_cell(gridwin, "A2", "1")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Delete", close_button="cancel") as xDialog:
             xdeleteall = xDialog.getChild("deleteall")
 
             if (get_state_as_dict(xdeleteall)["Selected"]) == "false":
diff --git a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
index 597ad439fa67..65aaf55b2bf2 100644
--- a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
+++ b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
@@ -17,7 +17,7 @@ class insertQrCode(UITestCase):
         document = self.ui_test.get_component()
 
         # cancel the dialog without doing anything
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode", close_button="cancel") as xDialog:
 
             xURL = xDialog.getChild("edit_text")
             type_text(xURL, "www.libreoffice.org")
@@ -26,7 +26,7 @@ class insertQrCode(UITestCase):
             document.Sheets.getByIndex(0).DrawPage.getByIndex(0)
 
         # Reopen the dialog box
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog:
 
             # Get elements in the Dialog Box
             xURL = xDialog.getChild("edit_text")
@@ -51,7 +51,7 @@ class insertQrCode(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog:
 
             xURL = xDialog.getChild("edit_text")
             xECC_Low = xDialog.getChild("button_low")
diff --git a/sc/qa/uitest/calc_tests3/tdf57274.py b/sc/qa/uitest/calc_tests3/tdf57274.py
index 4937a9b42afb..564060d208a2 100644
--- a/sc/qa/uitest/calc_tests3/tdf57274.py
+++ b/sc/qa/uitest/calc_tests3/tdf57274.py
@@ -22,7 +22,7 @@ class tdf57274(UITestCase):
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B6:E6"}))
             self.xUITest.executeCommand(".uno:Copy")
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B11"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial", close_button="") as xDialog:
                 #We paste here using Paste Special with 'Link' Checkbox activated
                 xLink = xDialog.getChild("link")
                 xLink.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests3/tdf62267.py b/sc/qa/uitest/calc_tests3/tdf62267.py
index 370eefb3ca5e..6a569e0f1098 100644
--- a/sc/qa/uitest/calc_tests3/tdf62267.py
+++ b/sc/qa/uitest/calc_tests3/tdf62267.py
@@ -23,12 +23,12 @@ class tdf62267(UITestCase):
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
             self.xUITest.executeCommand(".uno:Copy")
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
                 #it's the default - text, numbers and dates
                 pass
 
             #--> Cell formatting should stay as before
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr:
 
 
                 # check that we have exactly 1 conditional format
diff --git a/sc/qa/uitest/calc_tests3/tdf63805.py b/sc/qa/uitest/calc_tests3/tdf63805.py
index 1eebbc898420..bcbf59804675 100644
--- a/sc/qa/uitest/calc_tests3/tdf63805.py
+++ b/sc/qa/uitest/calc_tests3/tdf63805.py
@@ -24,7 +24,7 @@ class tdf63805(UITestCase):
             #2 - Select A1:A20
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A20"}))
             #3 - Edit -> fill -> Series -> Down - Date-Month-Increment=1 <ok>
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"):
+            with self.ui_test.execute_dialog_through_command(".uno:FillSeries"):
                 pass
             #5 -Expected: All Cells show last day of month / Actual: some months skipped
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getValue(), 41213)
diff --git a/sc/qa/uitest/calc_tests3/tdf65856.py b/sc/qa/uitest/calc_tests3/tdf65856.py
index 56c1bc397c19..e66a02597af1 100644
--- a/sc/qa/uitest/calc_tests3/tdf65856.py
+++ b/sc/qa/uitest/calc_tests3/tdf65856.py
@@ -21,7 +21,7 @@ class tdf65856(UITestCase):
             self.xUITest.executeCommand(".uno:Copy")
             #mark cell D1
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                 xmove_right = xDialog.getChild("move_right")
                 xmove_right.executeAction("CLICK", tuple())
@@ -53,7 +53,7 @@ class tdf65856(UITestCase):
             self.xUITest.executeCommand(".uno:Copy")
             #mark cell B2
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B2"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                 xmove_right = xDialog.getChild("move_right")
                 xmove_right.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests3/tdf69450.py b/sc/qa/uitest/calc_tests3/tdf69450.py
index e5be3998ed5e..615aa96497a3 100644
--- a/sc/qa/uitest/calc_tests3/tdf69450.py
+++ b/sc/qa/uitest/calc_tests3/tdf69450.py
@@ -23,7 +23,7 @@ class tdf69450(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         self.xUITest.executeCommand(".uno:Copy")
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
             xtext = xDialog.getChild("text")
             xnumbers = xDialog.getChild("numbers")
@@ -43,7 +43,7 @@ class tdf69450(UITestCase):
         self.xUITest.executeCommand(".uno:Bold")
         self.xUITest.executeCommand(".uno:Copy")
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial"):
+        with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial"):
             pass
 
         #check B1 text
diff --git a/sc/qa/uitest/calc_tests3/tdf69981.py b/sc/qa/uitest/calc_tests3/tdf69981.py
index c553d2eb6fae..c6dd94a42285 100644
--- a/sc/qa/uitest/calc_tests3/tdf69981.py
+++ b/sc/qa/uitest/calc_tests3/tdf69981.py
@@ -17,7 +17,7 @@ class tdf69981(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
             #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -31,7 +31,7 @@ class tdf69981(UITestCase):
             #Select A2:A7
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A7"}))
             #Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 xtab = xDialog.getChild("tab")
                 xcomma = xDialog.getChild("comma")
                 xtab.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests3/tdf73006.py b/sc/qa/uitest/calc_tests3/tdf73006.py
index 76e279c4757f..0dfd743a24ee 100644
--- a/sc/qa/uitest/calc_tests3/tdf73006.py
+++ b/sc/qa/uitest/calc_tests3/tdf73006.py
@@ -24,7 +24,7 @@ class tdf73006(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:
             xspace = xDialog.getChild("space")
             if (get_state_as_dict(xspace)["Selected"]) == "false":
                 xspace.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests3/tdf79983.py b/sc/qa/uitest/calc_tests3/tdf79983.py
index 82fe9056f597..347786e5a27f 100644
--- a/sc/qa/uitest/calc_tests3/tdf79983.py
+++ b/sc/qa/uitest/calc_tests3/tdf79983.py
@@ -25,7 +25,7 @@ class tdf79983(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"}))
 
         #Tools / Options / LibreOffice Calc / Sort Lists
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')                 # Calc
@@ -45,7 +45,7 @@ class tdf79983(UITestCase):
         enter_text_to_cell(gridwin, "A1", "AAA")
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"}))
         #fill down
-        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())
         #verify
diff --git a/sc/qa/uitest/calc_tests3/tdf82398.py b/sc/qa/uitest/calc_tests3/tdf82398.py
index 1e3b4268e2bf..c5d453476874 100644
--- a/sc/qa/uitest/calc_tests3/tdf82398.py
+++ b/sc/qa/uitest/calc_tests3/tdf82398.py
@@ -27,7 +27,7 @@ class tdf82398(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"}))
         self.xUITest.executeCommand(".uno:NumberFormatDate")
         # 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:
             xother = xDialog.getChild("other")
             xinputother = xDialog.getChild("inputother")
 
diff --git a/sc/qa/uitest/calc_tests4/tdf131170.py b/sc/qa/uitest/calc_tests4/tdf131170.py
index 508fc7d97aa3..0ee1552a0c46 100644
--- a/sc/qa/uitest/calc_tests4/tdf131170.py
+++ b/sc/qa/uitest/calc_tests4/tdf131170.py
@@ -13,7 +13,7 @@ class tdf131170(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineLabelRange") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DefineLabelRange") as xDialog:
 
                 xRange = xDialog.getChild("range")
                 self.assertEqual(4, len(xRange.getChildren()))
diff --git a/sc/qa/uitest/calc_tests4/tdf85403.py b/sc/qa/uitest/calc_tests4/tdf85403.py
index fb17610d4839..73859c38410f 100644
--- a/sc/qa/uitest/calc_tests4/tdf85403.py
+++ b/sc/qa/uitest/calc_tests4/tdf85403.py
@@ -22,7 +22,7 @@ class tdf85403(UITestCase):
             #putting a new SUM(A1) in C1 will show 123
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns"):
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns"):
                 pass
 
             #Verify
diff --git a/sc/qa/uitest/calc_tests4/tdf85979.py b/sc/qa/uitest/calc_tests4/tdf85979.py
index 1e2e6bb63962..df5f97315289 100644
--- a/sc/qa/uitest/calc_tests4/tdf85979.py
+++ b/sc/qa/uitest/calc_tests4/tdf85979.py
@@ -20,7 +20,7 @@ class tdf85979(UITestCase):
             #(I selected C1 to C5, then Text to Columns, unselected "Tab" and selected "Space")
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C5"}))
             # 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:
                 xspace = xDialog.getChild("space")
                 if (get_state_as_dict(xspace)["Selected"]) == "false":
                     xspace.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests4/tdf86253.py b/sc/qa/uitest/calc_tests4/tdf86253.py
index eb815f5080b7..66456523dfac 100644
--- a/sc/qa/uitest/calc_tests4/tdf86253.py
+++ b/sc/qa/uitest/calc_tests4/tdf86253.py
@@ -19,7 +19,7 @@ class tdf86253(UITestCase):
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
             self.xUITest.executeCommand(".uno:Copy")
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C17"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                 xtext = xDialog.getChild("text")
                 xnumbers = xDialog.getChild("numbers")
@@ -34,7 +34,7 @@ class tdf86253(UITestCase):
 
             #--> Cell formatting for C1:C17 is changed. But, if you go to "Format - Conditional Formatting - Manage",
             #you will see that a new formatting condition is created with the range "C1:C6", rather than "C1:C17". This is wrong behavior.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr:
 
 
                 # check that we have exactly 1 conditional format and range is C1:C17
diff --git a/sc/qa/uitest/calc_tests4/tdf88999.py b/sc/qa/uitest/calc_tests4/tdf88999.py
index 40300f8c31c6..e04957336609 100644
--- a/sc/qa/uitest/calc_tests4/tdf88999.py
+++ b/sc/qa/uitest/calc_tests4/tdf88999.py
@@ -23,7 +23,7 @@ class tdf88999(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")  #tab Numbers
             xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
diff --git a/sc/qa/uitest/calc_tests4/tdf89907.py b/sc/qa/uitest/calc_tests4/tdf89907.py
index aaa6b7cc4523..a88250a6a8a9 100644
--- a/sc/qa/uitest/calc_tests4/tdf89907.py
+++ b/sc/qa/uitest/calc_tests4/tdf89907.py
@@ -29,7 +29,7 @@ class tdf89907(UITestCase):
         #Optimal Width
         self.xUITest.executeCommand(".uno:SetOptimalColumnWidthDirect")
         # 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:
             xother = xDialog.getChild("other")
             xinputother = xDialog.getChild("inputother")
             if (get_state_as_dict(xother)["Selected"]) == "false":
diff --git a/sc/qa/uitest/calc_tests4/tdf92423.py b/sc/qa/uitest/calc_tests4/tdf92423.py
index f374a0d2f9ff..c282895fd1cf 100644
--- a/sc/qa/uitest/calc_tests4/tdf92423.py
+++ b/sc/qa/uitest/calc_tests4/tdf92423.py
@@ -19,7 +19,7 @@ class tdf92423(UITestCase):
         document = self.ui_test.get_component()
 
         #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xWriterEntry = xPages.getChild('3')                 # Calc
@@ -48,7 +48,7 @@ class tdf92423(UITestCase):
         gridWinState = get_state_as_dict(gridwin)
         self.assertEqual(gridWinState["MarkedArea"], "Sheet1.A7:Sheet1.A9")
         # 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:
             xSemicolon = xDialog.getChild("semicolon")  #check semicolon checkbox
             if (get_state_as_dict(xSemicolon)["Selected"]) == "false":
                 xSemicolon.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests4/textToColumns.py b/sc/qa/uitest/calc_tests4/textToColumns.py
index f7948ba29c87..e31c0d99dcc5 100644
--- a/sc/qa/uitest/calc_tests4/textToColumns.py
+++ b/sc/qa/uitest/calc_tests4/textToColumns.py
@@ -19,7 +19,7 @@ class CalcTextToColumns(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
             #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -35,7 +35,7 @@ class CalcTextToColumns(UITestCase):
             #Select A1:A5 on Sheet 'Dot_as_Separator'
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             #Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 #Untag Tab as separator and tag other. Put a dot into the input field next to the other checkbox
                 xtab = xDialog.getChild("tab")
                 xcomma = xDialog.getChild("comma")
@@ -93,7 +93,7 @@ class CalcTextToColumns(UITestCase):
             self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 4).getString(), "random content")
 
             #verify setting in options
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -109,7 +109,7 @@ class CalcTextToColumns(UITestCase):
             xCalcDoc = self.xUITest.getTopFocusWindow()
             gridwin = xCalcDoc.getChild("grid_window")
             #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -125,7 +125,7 @@ class CalcTextToColumns(UITestCase):
             # Select A1:A5
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 # Untag Tab as separator and tag comma.
                 xComma = xDialog.getChild("comma")
                 if (get_state_as_dict(xComma)["Selected"]) == "false":
@@ -178,7 +178,7 @@ class CalcTextToColumns(UITestCase):
             with self.ui_test.load_file(get_url_for_data_file("text_to_columns_semicolon.ods")) as calc_doc:
                 gridwin = xCalcDoc.getChild("grid_window")
                 #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -192,7 +192,7 @@ class CalcTextToColumns(UITestCase):
             # Select A1:A5 on Sheet
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 # Untag comma as separator and tag Semicolon
                 xSemicolon = xDialog.getChild("semicolon")
                 if (get_state_as_dict(xSemicolon)["Selected"]) == "false":
@@ -245,7 +245,7 @@ class CalcTextToColumns(UITestCase):
             with self.ui_test.load_file(get_url_for_data_file("text_to_columns_space.ods")) as calc_doc:
                 gridwin = xCalcDoc.getChild("grid_window")
                 #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -259,7 +259,7 @@ class CalcTextToColumns(UITestCase):
             # Select A1:A5 on Sheet
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 # Untag comma as separator and tag Semicolon
                 xSpace = xDialog.getChild("space")
                 if (get_state_as_dict(xSpace)["Selected"]) == "false":
@@ -313,7 +313,7 @@ class CalcTextToColumns(UITestCase):
             with self.ui_test.load_file(get_url_for_data_file("text_to_columns_pipe.ods")) as calc_doc:
                 gridwin = xCalcDoc.getChild("grid_window")
                 #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -327,7 +327,7 @@ class CalcTextToColumns(UITestCase):
             # Select A1:A5 on Sheet
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 # Untag comma as separator and tag Semicolon
                 xtab = xDialog.getChild("tab")
                 xcomma = xDialog.getChild("comma")
@@ -387,7 +387,7 @@ class CalcTextToColumns(UITestCase):
             with self.ui_test.load_file(get_url_for_data_file("text_to_columns_pipe_space.ods")) as calc_doc:
                 gridwin = xCalcDoc.getChild("grid_window")
                 #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
                 xPages = xDialogOpt.getChild("pages")
                 xWriterEntry = xPages.getChild('3')                 # Calc
@@ -401,7 +401,7 @@ class CalcTextToColumns(UITestCase):
             # Select A1:A5 on Sheet
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
             # Data - Text to Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog:
                 xtab = xDialog.getChild("tab")
                 xcomma = xDialog.getChild("comma")
                 xsemicolon = xDialog.getChild("semicolon")
diff --git a/sc/qa/uitest/calc_tests4/trackedChanges.py b/sc/qa/uitest/calc_tests4/trackedChanges.py
index e6d29efa87e2..cff17b17e204 100644
--- a/sc/qa/uitest/calc_tests4/trackedChanges.py
+++ b/sc/qa/uitest/calc_tests4/trackedChanges.py
@@ -47,13 +47,13 @@ class CalcTrackedChanges(UITestCase):
         document = self.ui_test.get_component()
         self.xUITest.executeCommand(".uno:TraceChangeMode")
         #protect dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ProtectTraceChangeMode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ProtectTraceChangeMode") as xDialog:
             xpass = xDialog.getChild("pass1ed")
             xpass.executeAction("TYPE", mkPropertyValues({"TEXT":"a"}))
             xconfirm = xDialog.getChild("confirm1ed")
             xconfirm.executeAction("TYPE", mkPropertyValues({"TEXT":"a"}))
         #verify password
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ProtectTraceChangeMode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ProtectTraceChangeMode") as xDialog:
             xpass = xDialog.getChild("pass1ed")
             xpass.executeAction("TYPE", mkPropertyValues({"TEXT":"a"}))
 
diff --git a/sc/qa/uitest/calc_tests6/autoFormat.py b/sc/qa/uitest/calc_tests6/autoFormat.py
index 0744d0d397ac..5547f81956cc 100644
--- a/sc/qa/uitest/calc_tests6/autoFormat.py
+++ b/sc/qa/uitest/calc_tests6/autoFormat.py
@@ -18,7 +18,7 @@ class autoFormat(UITestCase):
         #select A1:C5
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C5"}))
         #AutoFormat Styles
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoFormat") as xDialog:
 
             formatlb = xDialog.getChild("formatlb")
             numformatcb = xDialog.getChild("numformatcb")
@@ -39,7 +39,7 @@ class autoFormat(UITestCase):
 
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoFormat") as xDialog:
 
             formatlb = xDialog.getChild("formatlb")
             numformatcb = xDialog.getChild("numformatcb")
diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
index a3519a1dcd2e..158b738baf63 100644
--- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
+++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
@@ -17,7 +17,7 @@ class autocorrectOptions(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")       #tab replace
             origtext = xDialog.getChild("origtext")
diff --git a/sc/qa/uitest/calc_tests6/hideShowSheet.py b/sc/qa/uitest/calc_tests6/hideShowSheet.py
index f84d44fc3ac2..303c2cc5dce3 100644
--- a/sc/qa/uitest/calc_tests6/hideShowSheet.py
+++ b/sc/qa/uitest/calc_tests6/hideShowSheet.py
@@ -16,7 +16,7 @@ class hideShowSheet(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #insert sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
         #select sheet
         gridwin.executeAction("SELECT", mkPropertyValues({"TABLE":"1"}))
@@ -24,11 +24,11 @@ class hideShowSheet(UITestCase):
         #hide sheet
         self.xUITest.executeCommand(".uno:Hide")
         #show sheet Dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog:
             treeview = xDialog.getChild("treeview")
             self.assertEqual(get_state_as_dict(treeview)["Children"], "1")
         #insert 2nd sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
         #select sheet
         gridwin.executeAction("SELECT", mkPropertyValues({"TABLE":"2"}))
@@ -36,7 +36,7 @@ class hideShowSheet(UITestCase):
         #hide sheet
         self.xUITest.executeCommand(".uno:Hide")
         #show sheet Dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog:
             treeview = xDialog.getChild("treeview")
             self.assertEqual(get_state_as_dict(treeview)["Children"], "2")
 
diff --git a/sc/qa/uitest/calc_tests6/moveCopySheet.py b/sc/qa/uitest/calc_tests6/moveCopySheet.py
index 747dd77d3d69..7b038d8d9bde 100644
--- a/sc/qa/uitest/calc_tests6/moveCopySheet.py
+++ b/sc/qa/uitest/calc_tests6/moveCopySheet.py
@@ -16,7 +16,7 @@ class moveCopySheet(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #default - 1 sheet; select the sheet (is selected), dialog move/copy sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
             #new name = newName
             newName = xDialog.getChild("newName")
             newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
@@ -25,7 +25,7 @@ class moveCopySheet(UITestCase):
         #verify, the file has 2 sheets; first one "newName" is selected
         self.assertEqual(document.Sheets.getCount(), 2)
         # dialog move/copy sheet ; Move is selected; select -move to end position - ; New Name = moveName
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
             insertBefore = xDialog.getChild("insertBefore")
 
             xTreeEntry = insertBefore.getChild('2')
@@ -43,7 +43,7 @@ class moveCopySheet(UITestCase):
         self.assertEqual(document.Sheets[1].Name, "moveName")
 
         # Verify that the cancel button does not do anything
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:Move", close_button="cancel"):
             pass
 
         self.assertEqual(document.Sheets.getCount(), 2)
@@ -51,7 +51,7 @@ class moveCopySheet(UITestCase):
         self.assertEqual(document.Sheets[1].Name, "moveName")
 
         #Check copy option
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
             xCopy = xDialog.getChild("copy")
             xCopy.executeAction("CLICK", tuple())
             sheetName = "moveName_2"
diff --git a/sc/qa/uitest/calc_tests6/scenarios.py b/sc/qa/uitest/calc_tests6/scenarios.py
index 0686aaabd749..e4b10b449624 100644
--- a/sc/qa/uitest/calc_tests6/scenarios.py
+++ b/sc/qa/uitest/calc_tests6/scenarios.py
@@ -25,7 +25,7 @@ class scenarios(UITestCase):
         enter_text_to_cell(xGridWindow, "B4", "1")
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B4"}))
         #scenarios - scenario A1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ScenarioManager") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ScenarioManager") as xDialog:
 
             name = xDialog.getChild("name")
             name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
@@ -33,7 +33,7 @@ class scenarios(UITestCase):
             name.executeAction("TYPE", mkPropertyValues({"TEXT":"A1"}))
 
         #next scenarios - scenario B1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ScenarioManager") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ScenarioManager") as xDialog:
 
             name = xDialog.getChild("name")
             name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
index feef08e5022b..a7d1b762752a 100644
--- a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
+++ b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
@@ -18,7 +18,7 @@ class shareSpreadsheet(UITestCase):
         document = self.ui_test.get_component()
 
         #dialog shareSpreadsheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ShareDocument", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ShareDocument", close_button="cancel") as xDialog:
 
             share = xDialog.getChild("share")
             share.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/calc_tests6/tdf104378.py b/sc/qa/uitest/calc_tests6/tdf104378.py
index e228bbb9dd7e..a210306f3193 100644
--- a/sc/qa/uitest/calc_tests6/tdf104378.py
+++ b/sc/qa/uitest/calc_tests6/tdf104378.py
@@ -17,7 +17,7 @@ class tdf104378(UITestCase):
 
         enter_text_to_cell(gridwin, "A1", "遠程MySQL連接遠程MySQL連接遠程MySQL連接")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChineseConversion"):
+        with self.ui_test.execute_dialog_through_command(".uno:ChineseConversion"):
             pass
 
         document = self.ui_test.get_component()
diff --git a/sc/qa/uitest/calc_tests6/tdf107267.py b/sc/qa/uitest/calc_tests6/tdf107267.py
index 9e005abbed38..a15f1ac62d7a 100644
--- a/sc/qa/uitest/calc_tests6/tdf107267.py
+++ b/sc/qa/uitest/calc_tests6/tdf107267.py
@@ -23,7 +23,7 @@ class Subtotals(UITestCase):
             # 1. Open the test file
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:F123"}))
             # 2. Data->Subtotals
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "0")
                 # = 1st group = 3. Group by "Person Number", select "shipping time" and use the Max function.
diff --git a/sc/qa/uitest/calc_tests6/tdf116996.py b/sc/qa/uitest/calc_tests6/tdf116996.py
index fc6fd625cb0c..9552b7ccc26a 100644
--- a/sc/qa/uitest/calc_tests6/tdf116996.py
+++ b/sc/qa/uitest/calc_tests6/tdf116996.py
@@ -16,7 +16,7 @@ class tdf116996(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="") as xDialogOpt:
             xPages = xDialogOpt.getChild("pages")
             xLOEntry = xPages.getChild('0')                 # Libreoffice
             xLOEntry.executeAction("EXPAND", tuple())
@@ -31,7 +31,7 @@ class tdf116996(UITestCase):
                 pass
 
         #reopen options dialog and verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="") as xDialogOpt:
             xPages = xDialogOpt.getChild("pages")
             xLOEntry = xPages.getChild('0')                 # Libreoffice
             xLOEntry.executeAction("EXPAND", tuple())
diff --git a/sc/qa/uitest/calc_tests6/tdf118638.py b/sc/qa/uitest/calc_tests6/tdf118638.py
index 1c499603f57c..69beea275128 100644
--- a/sc/qa/uitest/calc_tests6/tdf118638.py
+++ b/sc/qa/uitest/calc_tests6/tdf118638.py
@@ -22,7 +22,7 @@ class Subtotals(UITestCase):
             # Open the test file
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B15"}))
             #Data->Subtotals
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "0")
                 xGroupBy = xDialog.getChild("group_by")
diff --git a/sc/qa/uitest/calc_tests6/tdf121263.py b/sc/qa/uitest/calc_tests6/tdf121263.py
index 5bda02d27fac..1a3776f811d9 100644
--- a/sc/qa/uitest/calc_tests6/tdf121263.py
+++ b/sc/qa/uitest/calc_tests6/tdf121263.py
@@ -18,9 +18,9 @@ class tdf121263(UITestCase):
         document = self.ui_test.get_component()
         gridwin = xTopWindow.getChild("grid_window")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
 
         gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "2"}))
@@ -31,7 +31,7 @@ class tdf121263(UITestCase):
         self.xUITest.executeCommand(".uno:Hide")
 
         #show sheet Dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog:
             treeview = xDialog.getChild("treeview")
             self.assertEqual(get_state_as_dict(treeview)["Children"], "2")
 
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py b/sc/qa/uitest/calc_tests6/tdf91726.py
index a6071e0a4fae..4f64d9588202 100644
--- a/sc/qa/uitest/calc_tests6/tdf91726.py
+++ b/sc/qa/uitest/calc_tests6/tdf91726.py
@@ -18,7 +18,7 @@ class tdf91726(UITestCase):
         #select A1:E9
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:E9"}))
         #AutoFormat Styles
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat", close_button="") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoFormat", close_button="") as xDialog:
             #add new style "Default"
             xadd = xDialog.getChild("add")
 
diff --git a/sc/qa/uitest/calc_tests7/tdf106667.py b/sc/qa/uitest/calc_tests7/tdf106667.py
index 30727b42bf8e..16503995f121 100644
--- a/sc/qa/uitest/calc_tests7/tdf106667.py
+++ b/sc/qa/uitest/calc_tests7/tdf106667.py
@@ -25,7 +25,7 @@ class tdf106667(UITestCase):
 
         self.xUITest.executeCommand(".uno:SelectAll")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:About", close_button="btnClose") as xAboutDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:About", close_button="btnClose") as xAboutDlg:
             pass
 
         self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "A")
diff --git a/sc/qa/uitest/calc_tests7/tdf122509.py b/sc/qa/uitest/calc_tests7/tdf122509.py
index 71deb3ee412a..dedace588808 100644
--- a/sc/qa/uitest/calc_tests7/tdf122509.py
+++ b/sc/qa/uitest/calc_tests7/tdf122509.py
@@ -21,7 +21,7 @@ class tdf122509(UITestCase):
             #select cell A1
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
             #format - cell
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "0")  #tab Numbers
                 xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
diff --git a/sc/qa/uitest/calc_tests7/tdf123122.py b/sc/qa/uitest/calc_tests7/tdf123122.py
index 6e267d3f4d53..566ac527eef3 100644
--- a/sc/qa/uitest/calc_tests7/tdf123122.py
+++ b/sc/qa/uitest/calc_tests7/tdf123122.py
@@ -21,7 +21,7 @@ class tdf123122(UITestCase):
         #select cell A1
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")  #tab Numbers
             xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
@@ -41,7 +41,7 @@ class tdf123122(UITestCase):
         #verify
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
         #format - cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")  #tab Numbers
             xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
diff --git a/sc/qa/uitest/calc_tests7/tdf124896.py b/sc/qa/uitest/calc_tests7/tdf124896.py
index 4d328d1391ce..cfed36c1da7f 100644
--- a/sc/qa/uitest/calc_tests7/tdf124896.py
+++ b/sc/qa/uitest/calc_tests7/tdf124896.py
@@ -16,7 +16,7 @@ class tdf124896(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
 
         # Remove X Bar R Chart (2) sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes") as xDialog:
             pass
 
         #verify; no crashes
diff --git a/sc/qa/uitest/calc_tests8/navigator.py b/sc/qa/uitest/calc_tests8/navigator.py
index de4059bbc5f9..86e473dae8d6 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -37,7 +37,7 @@ class navigator(UITestCase):
             self.assertEqual(len(xComments.getChildren()), 1)
             self.assertEqual(get_state_as_dict(xComments.getChild('0'))['Text'], 'Test Comment')
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
                 xname_entry = xDialog.getChild("name_entry")
                 xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT": "S1"}))
 
diff --git a/sc/qa/uitest/calc_tests8/tdf114710.py b/sc/qa/uitest/calc_tests8/tdf114710.py
index f12d1fae2493..e3d772bc8c8d 100644
--- a/sc/qa/uitest/calc_tests8/tdf114710.py
+++ b/sc/qa/uitest/calc_tests8/tdf114710.py
@@ -22,7 +22,7 @@ class tdf114710(UITestCase):
 
                 self.xUITest.getTopFocusWindow()
 
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                     xList = xDialog.getChild('list')
 
diff --git a/sc/qa/uitest/calc_tests8/tdf118308.py b/sc/qa/uitest/calc_tests8/tdf118308.py
index a3d6f74111e5..4160d609e263 100644
--- a/sc/qa/uitest/calc_tests8/tdf118308.py
+++ b/sc/qa/uitest/calc_tests8/tdf118308.py
@@ -29,7 +29,7 @@ class tdf118308(UITestCase):
 
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                 # Without the fix in place, this test would have failed here
                 # since a different dialog would have been opened and the children
diff --git a/sc/qa/uitest/calc_tests8/tdf125051.py b/sc/qa/uitest/calc_tests8/tdf125051.py
index 0f4eb92efbb9..992f3b0822e4 100644
--- a/sc/qa/uitest/calc_tests8/tdf125051.py
+++ b/sc/qa/uitest/calc_tests8/tdf125051.py
@@ -21,7 +21,7 @@ class tdf125051(UITestCase):
         document = self.ui_test.get_component()
         enter_text_to_cell(gridwin, "A1", "text")
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SpellDialog") as xDialog2:
+        with self.ui_test.execute_dialog_through_command(".uno:SpellDialog") as xDialog2:
             pass
 
 
diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py b/sc/qa/uitest/calc_tests8/tdf126248.py
index 1609a43cb2bf..773518c6e35b 100644
--- a/sc/qa/uitest/calc_tests8/tdf126248.py
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -31,7 +31,7 @@ class tdf126248(UITestCase):
         self.xUITest.executeCommand(".uno:Sidebar")
 
     def changeLocalSetting(self, language):
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
             xPages = xDialog.getChild("pages")
             xLanguageEntry = xPages.getChild('2')
             xLanguageEntry.executeAction("EXPAND", tuple())
@@ -53,7 +53,7 @@ class tdf126248(UITestCase):
 
             self.changeLocalSetting("Chinese (traditional)")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
 
diff --git a/sc/qa/uitest/calc_tests8/tdf137726.py b/sc/qa/uitest/calc_tests8/tdf137726.py
index 662d91da64a1..205f9e416854 100644
--- a/sc/qa/uitest/calc_tests8/tdf137726.py
+++ b/sc/qa/uitest/calc_tests8/tdf137726.py
@@ -14,7 +14,7 @@ class tdf137726(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
 
         # three dialogs are displayed one after the other, click OK in all of them
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataDataPilotRun") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun") as xDialog:
             pass
 
         for i in range(2):
diff --git a/sc/qa/uitest/calc_tests9/pivotTable.py b/sc/qa/uitest/calc_tests9/pivotTable.py
index 402682378457..b7a4fd328b2a 100644
--- a/sc/qa/uitest/calc_tests9/pivotTable.py
+++ b/sc/qa/uitest/calc_tests9/pivotTable.py
@@ -25,7 +25,7 @@ class pivotTable(UITestCase):
             self.xUITest.executeCommand(".uno:GoUp")
 
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataDataPilotRun") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun") as xDialog:
                 xFields = xDialog.getChild("listbox-fields")
                 self.assertEqual(2, len(xFields.getChildren()))
                 self.assertEqual("qtX", get_state_as_dict(xFields.getChild('0'))['Text'])
diff --git a/sc/qa/uitest/calc_tests9/tdf121949.py b/sc/qa/uitest/calc_tests9/tdf121949.py
index e3e8da9340a8..ec1876c4f148 100644
--- a/sc/qa/uitest/calc_tests9/tdf121949.py
+++ b/sc/qa/uitest/calc_tests9/tdf121949.py
@@ -19,7 +19,7 @@ class tdf121949 (UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B1", "EXTEND":"1"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B3:B3", "EXTEND":"1"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C3", "EXTEND":"1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Copy"):
+        with self.ui_test.execute_dialog_through_command(".uno:Copy"):
             pass
 
         self.ui_test.close_doc()
diff --git a/sc/qa/uitest/calc_tests9/tdf126673.py b/sc/qa/uitest/calc_tests9/tdf126673.py
index a837a4d900e9..a303949d0f1a 100644
--- a/sc/qa/uitest/calc_tests9/tdf126673.py
+++ b/sc/qa/uitest/calc_tests9/tdf126673.py
@@ -25,13 +25,13 @@ class tdf126673(UITestCase):
             #select A2
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
             #optimal row height
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SetOptimalRowHeight") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight") as xDialog:
                 pass
 
             #select A2
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
             #row height
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight", close_button="cancel") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:RowHeight", close_button="cancel") as xDialog:
                 xvalue = xDialog.getChild("value")
                 heightStrOrig = get_state_as_dict(xvalue)["Text"]
                 heightVal = heightStrOrig[:4]  #default 0.45 cm,
diff --git a/sc/qa/uitest/calc_tests9/tdf130371.py b/sc/qa/uitest/calc_tests9/tdf130371.py
index c376da47e0d9..ce2b1d47ea77 100644
--- a/sc/qa/uitest/calc_tests9/tdf130371.py
+++ b/sc/qa/uitest/calc_tests9/tdf130371.py
@@ -20,7 +20,7 @@ class namedRanges(UITestCase):
             text2 = "value\t$Sheet3.$B$2\tSheet3"
             text3 = "value\t$Sheet4.$B$2\tSheet4"
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
                 namesList = xDialog.getChild('names')
                 self.assertEqual(2, len(namesList.getChildren()))
                 self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1)
@@ -35,7 +35,7 @@ class namedRanges(UITestCase):
 
             self.xUITest.executeCommand(".uno:Paste")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
                 namesList = xDialog.getChild('names')
                 self.assertEqual(3, len(namesList.getChildren()))
                 self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1)
@@ -45,7 +45,7 @@ class namedRanges(UITestCase):
 
             self.xUITest.executeCommand(".uno:Undo")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName", close_button="cancel") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DefineName", close_button="cancel") as xDialog:
                 namesList = xDialog.getChild('names')
                 self.assertEqual(2, len(namesList.getChildren()))
                 self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1)
diff --git a/sc/qa/uitest/calc_tests9/tdf133629.py b/sc/qa/uitest/calc_tests9/tdf133629.py
index d2e0ee722bb2..67bead7fdec8 100644
--- a/sc/qa/uitest/calc_tests9/tdf133629.py
+++ b/sc/qa/uitest/calc_tests9/tdf133629.py
@@ -16,7 +16,7 @@ class tdf133629(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
 
         self.xUITest.executeCommand(".uno:TableSelectAll")
@@ -27,7 +27,7 @@ class tdf133629(UITestCase):
         self.assertIsNotNone(getattr(document.CurrentSelection, 'Sheet1.A1:AMJ1048576'))
         self.assertIsNotNone(getattr(document.CurrentSelection, 'Sheet1.A2:AMJ1048576'))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
diff --git a/sc/qa/uitest/calc_tests9/tdf137446.py b/sc/qa/uitest/calc_tests9/tdf137446.py
index f62280401ecf..9ed6a0b36327 100644
--- a/sc/qa/uitest/calc_tests9/tdf137446.py
+++ b/sc/qa/uitest/calc_tests9/tdf137446.py
@@ -21,7 +21,7 @@ class tdf137446(UITestCase):
 
             gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "lineObject"}))
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
 
 
                 self.assertEqual('10', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
@@ -34,7 +34,7 @@ class tdf137446(UITestCase):
                 xDialog.getChild('MTR_FLD_WIDTH').executeAction("UP", tuple())
 
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
 
 
                 self.assertEqual('10.1', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
diff --git a/sc/qa/uitest/calc_tests9/tdf141244.py b/sc/qa/uitest/calc_tests9/tdf141244.py
index 187891cb2b0c..ea8a467c4b66 100644
--- a/sc/qa/uitest/calc_tests9/tdf141244.py
+++ b/sc/qa/uitest/calc_tests9/tdf141244.py
@@ -20,7 +20,7 @@ class tdf141244(UITestCase):
 
         enter_text_to_cell(gridwin, "A1", '=DDE("soffice";"data1.ods";"sheet1.A1")')
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditLinks", close_button="close") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditLinks", close_button="close") as xDialog:
 
             xLinks = xDialog.getChild("TB_LINKS")
             self.assertEqual(1, len(xLinks.getChildren()))
diff --git a/sc/qa/uitest/chart/copyPaste.py b/sc/qa/uitest/chart/copyPaste.py
index bef17145690a..e2d8fe0349e2 100644
--- a/sc/qa/uitest/chart/copyPaste.py
+++ b/sc/qa/uitest/chart/copyPaste.py
@@ -39,7 +39,7 @@ class CopyPaste(UITestCase):
         with self.ui_test.load_empty_file("calc") as calc_document:
 
             # Rename the sheet to match the same name as the first document
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
                 xname_entry = xDialog.getChild("name_entry")
 
                 xname_entry.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sc/qa/uitest/chart/create_chart.py b/sc/qa/uitest/chart/create_chart.py
index 42f8211a8e83..878af422a581 100644
--- a/sc/qa/uitest/chart/create_chart.py
+++ b/sc/qa/uitest/chart/create_chart.py
@@ -34,7 +34,7 @@ class CalcChartUIDemo(UITestCase):
 
         self.fill_spreadsheet()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel"):
             pass
 
         self.ui_test.close_doc()
@@ -45,7 +45,7 @@ class CalcChartUIDemo(UITestCase):
 
         self.fill_spreadsheet()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             pass
 
         self.ui_test.close_doc()
@@ -56,7 +56,7 @@ class CalcChartUIDemo(UITestCase):
 
         self.fill_spreadsheet()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
             xNextBtn = xChartDlg.getChild("next")
             xNextBtn.executeAction("CLICK", tuple())
 
@@ -76,7 +76,7 @@ class CalcChartUIDemo(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             pass
 
         xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
@@ -94,7 +94,7 @@ class CalcChartUIDemo(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             pass
 
         xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
@@ -115,7 +115,7 @@ class CalcChartUIDemo(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             pass
 
         xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
diff --git a/sc/qa/uitest/chart/edit_chart.py b/sc/qa/uitest/chart/edit_chart.py
index 4c9bb50c25ea..48d9149004f5 100644
--- a/sc/qa/uitest/chart/edit_chart.py
+++ b/sc/qa/uitest/chart/edit_chart.py
@@ -36,7 +36,7 @@ class CalcChartEditUIDemo(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             pass
 
         xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
diff --git a/sc/qa/uitest/chart/tdf101894.py b/sc/qa/uitest/chart/tdf101894.py
index 66dcf1fbc483..9737d41046e1 100644
--- a/sc/qa/uitest/chart/tdf101894.py
+++ b/sc/qa/uitest/chart/tdf101894.py
@@ -34,7 +34,7 @@ class tdf101894(UITestCase):
             xOldSheetRanges.append(xRow)
 
         # Rename the sheet first
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
             xname_entry = xDialog.getChild("name_entry")
 
             oldName = get_state_as_dict(xname_entry)['Text']
@@ -43,7 +43,7 @@ class tdf101894(UITestCase):
             xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"}))
 
         # Copy sheet and use the old name
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
             newName = xDialog.getChild("newName")
             newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
diff --git a/sc/qa/uitest/chart/tdf124295.py b/sc/qa/uitest/chart/tdf124295.py
index f4f75e42c6f3..131f897c9573 100644
--- a/sc/qa/uitest/chart/tdf124295.py
+++ b/sc/qa/uitest/chart/tdf124295.py
@@ -16,7 +16,7 @@ class tdf124295(UITestCase):
     def test_tdf124295(self):
         # Open spreadsheet and insert chart
         self.ui_test.create_doc_in_start_center("calc")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel") as xChartDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel") as xChartDlg:
 
             # Click 3D look check button
             x3DCheckBtn = xChartDlg.getChild("3dlook")
diff --git a/sc/qa/uitest/chart/tdf131715.py b/sc/qa/uitest/chart/tdf131715.py
index 11c4ae42fd2c..d8954d9cfab6 100644
--- a/sc/qa/uitest/chart/tdf131715.py
+++ b/sc/qa/uitest/chart/tdf131715.py
@@ -11,7 +11,7 @@ class tdf131715(UITestCase):
 
     def test_tdf131715(self):
         self.ui_test.create_doc_in_start_center("calc")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
 
             xWizard = xChartDlg.getChild('Wizard')
 
diff --git a/sc/qa/uitest/chart/tdf43175.py b/sc/qa/uitest/chart/tdf43175.py
index cc3b24e8b778..08ad67b2211d 100644
--- a/sc/qa/uitest/chart/tdf43175.py
+++ b/sc/qa/uitest/chart/tdf43175.py
@@ -15,7 +15,7 @@ class Tdf43175(UITestCase):
 
             self.xUITest.executeCommand(".uno:TableSelectAll")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
                 insertBefore = xDialog.getChild("insertBefore")
 
                 # Select - move to end position -
diff --git a/sc/qa/uitest/chart/tdf46885.py b/sc/qa/uitest/chart/tdf46885.py
index 6f95ab9636bb..637033505fd3 100644
--- a/sc/qa/uitest/chart/tdf46885.py
+++ b/sc/qa/uitest/chart/tdf46885.py
@@ -21,7 +21,7 @@ class tdf46885(UITestCase):
         document = self.ui_test.get_component()
         enter_text_to_cell(gridwin, "A10", "col1")
         #When you start a new chart and have one empty cell selected LibO will crash when you select the Next>> button.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
             xNextBtn = xChartDlg.getChild("next")
             xNextBtn.executeAction("CLICK", tuple())
 
@@ -38,7 +38,7 @@ class tdf46885(UITestCase):
         enter_text_to_cell(gridwin, "A10", "col1")
         #If you select multiple empty cells and then start a new chart LibO will crash immediately.
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C4"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
             xNextBtn = xChartDlg.getChild("next")
             xNextBtn.executeAction("CLICK", tuple())
 
diff --git a/sc/qa/uitest/chart/tdf62349.py b/sc/qa/uitest/chart/tdf62349.py
index cf5d231bbba5..8cc3e6b9c741 100644
--- a/sc/qa/uitest/chart/tdf62349.py
+++ b/sc/qa/uitest/chart/tdf62349.py
@@ -21,7 +21,7 @@ class tdf62349(UITestCase):
             #3: select all data cells C5:H9
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C5:H9"}))
             # 4: create a chart with insert/chart menu
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+            with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
                 pass
 
             # 5: (single) click to an empty cell to finalize the chart
diff --git a/sc/qa/uitest/chart/tdf99069.py b/sc/qa/uitest/chart/tdf99069.py
index c6eec4d035e7..67d1ca86f845 100644
--- a/sc/qa/uitest/chart/tdf99069.py
+++ b/sc/qa/uitest/chart/tdf99069.py
@@ -20,7 +20,7 @@ class tdf99069(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         #(1) Download and open example.ods attached to tdf#97266  with cell B1 active.
         #(2) In tool bar, click the chart icon.  Program presents Chart Wizard.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
             # the chart shows a border with handles on each side and at each corner.
             pass
 
diff --git a/sc/qa/uitest/conditional_format/tdf100793.py b/sc/qa/uitest/conditional_format/tdf100793.py
index 15da954df0ba..26e0c6c201a5 100644
--- a/sc/qa/uitest/conditional_format/tdf100793.py
+++ b/sc/qa/uitest/conditional_format/tdf100793.py
@@ -25,7 +25,7 @@ class tdf100793(UITestCase):
             #2) Go to sheet "plan"
             gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "2"}))
             #3) Open the conditional formatting management dialog-> The indicated range should be G18:K29,F18,F20:F29
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
 
                 # check that we have exactly one conditional formats in the beginning
                 xList = xCondFormatMgr.getChild("CONTAINER")
@@ -72,7 +72,7 @@ class tdf100793(UITestCase):
                 self.ui_test.close_dialog_through_button(xOKBtn)
 
             #verify - reopen, check range
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
                 xEditBtn = xCondFormatMgr.getChild("edit")
                 with self.ui_test.execute_dialog_through_action(xEditBtn, "CLICK", event_name = "ModelessDialogVisible") as xCondFormatDlg:
                     xedassign = xCondFormatDlg.getChild("edassign")
diff --git a/sc/qa/uitest/conditional_format/tdf104026.py b/sc/qa/uitest/conditional_format/tdf104026.py
index 3f8195f60dc4..f699c9b640dc 100644
--- a/sc/qa/uitest/conditional_format/tdf104026.py
+++ b/sc/qa/uitest/conditional_format/tdf104026.py
@@ -12,7 +12,7 @@ class Tdf104026(UITestCase):
 
   def execute_conditional_format_manager_dialog(self, nCount):
 
-    with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr:
+    with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr:
 
         aExpectedResults = ['A2\tCell value != $Sheet1.$B2', 'A3\tCell value != $Sheet1.$B3',
             'A4\tCell value != $Sheet1.$B4', 'A5\tCell value != $Sheet1.$B5',
diff --git a/sc/qa/uitest/conditional_format/tdf105544.py b/sc/qa/uitest/conditional_format/tdf105544.py
index e0c58b55e373..90bcda427cb0 100644
--- a/sc/qa/uitest/conditional_format/tdf105544.py
+++ b/sc/qa/uitest/conditional_format/tdf105544.py
@@ -20,7 +20,7 @@ class tdf105544(UITestCase):
             gridwin = xCalcDoc.getChild("grid_window")
             #2. select B3. Format> conditional formatting> manage
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"}))
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
 
                 # check that we have exactly four conditional formats in the beginning
                 xList = xCondFormatMgr.getChild("CONTAINER")
diff --git a/sc/qa/uitest/conditional_format/tdf117899.py b/sc/qa/uitest/conditional_format/tdf117899.py
index 12bbb5cce5b4..20c3a71e5264 100644
--- a/sc/qa/uitest/conditional_format/tdf117899.py
+++ b/sc/qa/uitest/conditional_format/tdf117899.py
@@ -16,7 +16,7 @@ class Tdf117899(UITestCase):
 
   def execute_conditional_format_manager_dialog(self):
 
-    with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr:
+    with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr:
 
         aExpectedResult = 'Formula is $E3="нет"'
         xList = xCondFormatMgr.getChild("CONTAINER")
@@ -45,7 +45,7 @@ class Tdf117899(UITestCase):
                 self.xUITest.executeCommandWithParameters(".uno:ClipboardFormatItems", formatProperty)
 
                 # Save Copy as
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:ObjectMenue?VerbID:short=-8", close_button="open") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:ObjectMenue?VerbID:short=-8", close_button="open") as xDialog:
 
                     xFileName = xDialog.getChild("file_name")
                     xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sc/qa/uitest/conditional_format/tdf81696.py b/sc/qa/uitest/conditional_format/tdf81696.py
index 18c3d32f3ac8..235310df6c49 100644
--- a/sc/qa/uitest/conditional_format/tdf81696.py
+++ b/sc/qa/uitest/conditional_format/tdf81696.py
@@ -24,7 +24,7 @@ class tdf81696(UITestCase):
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"}))
             #Open sort dialog by DATA - SORT,Just sort it by Column A, ascending. (it's default)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 xleftright = xDialog.getChild("leftright")
                 select_pos(xTabs, "0")
diff --git a/sc/qa/uitest/conditional_format/tdf96453.py b/sc/qa/uitest/conditional_format/tdf96453.py
index 39b6b6eabb50..26aa40b8c233 100644
--- a/sc/qa/uitest/conditional_format/tdf96453.py
+++ b/sc/qa/uitest/conditional_format/tdf96453.py
@@ -20,7 +20,7 @@ class ConditionalFormatDlgTest(UITestCase):
             conditional_format_list = get_conditional_format_from_sheet(sheet)
             self.assertEqual(conditional_format_list.getLength(), 2)
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
+            with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr:
 
 
                 # check that we have exactly two conditional formats in the beginning
diff --git a/sc/qa/uitest/csv_dialog/tdf142395.py b/sc/qa/uitest/csv_dialog/tdf142395.py
index 412ce6e6f53a..a667a886ca8d 100644
--- a/sc/qa/uitest/csv_dialog/tdf142395.py
+++ b/sc/qa/uitest/csv_dialog/tdf142395.py
@@ -14,7 +14,7 @@ class Tdf142395(UITestCase):
     def test_tdf142395(self):
 
         # Load file from Open dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog:
 
             xFileName = xOpenDialog.getChild("file_name")
             xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf142395.csv")}))
diff --git a/sc/qa/uitest/csv_dialog/tdf57841.py b/sc/qa/uitest/csv_dialog/tdf57841.py
index 9deda7611aa7..87c2a2b1b9f5 100644
--- a/sc/qa/uitest/csv_dialog/tdf57841.py
+++ b/sc/qa/uitest/csv_dialog/tdf57841.py
@@ -14,7 +14,7 @@ class Tdf57841(UITestCase):
     def test_tdf57841(self):
 
         # Load file from Open dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog:
 
             xFileName = xOpenDialog.getChild("file_name")
             xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf57841.csv")}))
diff --git a/sc/qa/uitest/csv_dialog/tdf60468.py b/sc/qa/uitest/csv_dialog/tdf60468.py
index 36baa64082fa..bb4603de56b4 100644
--- a/sc/qa/uitest/csv_dialog/tdf60468.py
+++ b/sc/qa/uitest/csv_dialog/tdf60468.py
@@ -14,7 +14,7 @@ class Tdf60468(UITestCase):
     def test_tdf60468(self):
 
         # Load file from Open dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog:
 
             xFileName = xOpenDialog.getChild("file_name")
             xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf60468.csv")}))
diff --git a/sc/qa/uitest/key_f4/f4.py b/sc/qa/uitest/key_f4/f4.py
index a6da13d8afc9..e1be28dcda77 100644
--- a/sc/qa/uitest/key_f4/f4.py
+++ b/sc/qa/uitest/key_f4/f4.py
@@ -84,7 +84,7 @@ class keyF4(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #* Tools --> Options --> Calc --> Formula -->  Syntax = Excel R1C1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')                 # Calc
@@ -113,7 +113,7 @@ class keyF4(UITestCase):
         self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "=R3C3")
 
         #Give it back Tools --> Options --> Calc --> Formula -->  Syntax = Calc A1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')                 # Calc
diff --git a/sc/qa/uitest/manual_tests/calc.py b/sc/qa/uitest/manual_tests/calc.py
index 6e05f5b97de9..92c33e0d1803 100644
--- a/sc/qa/uitest/manual_tests/calc.py
+++ b/sc/qa/uitest/manual_tests/calc.py
@@ -37,7 +37,7 @@ class ManualCalcTests(UITestCase):
         xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
         # Execute "Select DB Range dialog"
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SelectDB") as xSelectNameDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:SelectDB") as xSelectNameDlg:
 
             xListBox = xSelectNameDlg.getChild("treeview")
             xListBoxState = get_state_as_dict(xListBox)
@@ -70,7 +70,7 @@ class ManualCalcTests(UITestCase):
         xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B10"}))
 
         # Execute "Sort" dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort"):
             pass
 
         document = self.ui_test.get_component()
@@ -95,7 +95,7 @@ class ManualCalcTests(UITestCase):
         xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
         xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xValidationDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xValidationDlg:
 
             xAllowList = xValidationDlg.getChild("allow")
             xAllowList.executeAction("SELECT", mkPropertyValues({"POS": "1"}))
@@ -135,7 +135,7 @@ class ManualCalcTests(UITestCase):
 
         xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xPasteSpecialDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg:
 
             xAllChkBox = xPasteSpecialDlg.getChild("paste_all")
             xAllChkBox.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/manual_tests/more_calc.py b/sc/qa/uitest/manual_tests/more_calc.py
index e99015a92f2e..9212c2606e0e 100644
--- a/sc/qa/uitest/manual_tests/more_calc.py
+++ b/sc/qa/uitest/manual_tests/more_calc.py
@@ -35,7 +35,7 @@ class ManualCalcTests(UITestCase):
         xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
 
         # Choose Paste Special Options and paste data
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xPasteSpecialDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg:
             xAllChkBox = xPasteSpecialDlg.getChild("paste_all")
             xAllChkBox.executeAction("CLICK", tuple())
             xLinkChkBox = xPasteSpecialDlg.getChild("link")
diff --git a/sc/qa/uitest/options/tdf122977.py b/sc/qa/uitest/options/tdf122977.py
index 342faf23df50..1ca0c1465dde 100644
--- a/sc/qa/uitest/options/tdf122977.py
+++ b/sc/qa/uitest/options/tdf122977.py
@@ -21,7 +21,7 @@ class chartDefaultColors(UITestCase):
         document = self.ui_test.get_component()
 
         #Go to Tools -> Options -> Charts -> Default Colors
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xChartEntry = xPages.getChild('5')                 # Charts
diff --git a/sc/qa/uitest/pageFormat/tdf123508.py b/sc/qa/uitest/pageFormat/tdf123508.py
index 5b74955c6072..9fe086341fe4 100644
--- a/sc/qa/uitest/pageFormat/tdf123508.py
+++ b/sc/qa/uitest/pageFormat/tdf123508.py
@@ -20,7 +20,7 @@ class tdf123508(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         gridwin = xCalcDoc.getChild("grid_window")
         #open "Format > Page - Sheet > Scale
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageFormatDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageFormatDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Scale
             scalingMode = xDialog.getChild("comboLB_SCALEMODE")
@@ -34,7 +34,7 @@ class tdf123508(UITestCase):
 
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageFormatDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageFormatDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")  #tab Scale
             scalingMode = xDialog.getChild("comboLB_SCALEMODE")
diff --git a/sc/qa/uitest/protect/protectSheet.py b/sc/qa/uitest/protect/protectSheet.py
index 12b0cd336f05..353da927d1f6 100644
--- a/sc/qa/uitest/protect/protectSheet.py
+++ b/sc/qa/uitest/protect/protectSheet.py
@@ -21,7 +21,7 @@ class protectSheet(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #enter password - lock
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Protect") as xDialog:
             xprotect = xDialog.getChild("protect")
             xpassword1 = xDialog.getChild("password1")
             xpassword2 = xDialog.getChild("password2")
@@ -33,7 +33,7 @@ class protectSheet(UITestCase):
 
         #Unlock
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Protect") as xDialog:
             xpass1ed = xDialog.getChild("pass1ed")
 
             xpass1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"}))
@@ -43,7 +43,7 @@ class protectSheet(UITestCase):
         self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), "A")
 
         # test cancel button
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:Protect", close_button="cancel"):
             pass
 
         enter_text_to_cell(gridwin, "B2", "B")
diff --git a/sc/qa/uitest/protect/protectSpreadsheet.py b/sc/qa/uitest/protect/protectSpreadsheet.py
index 53424e415073..8659dc621e82 100644
--- a/sc/qa/uitest/protect/protectSpreadsheet.py
+++ b/sc/qa/uitest/protect/protectSpreadsheet.py
@@ -21,7 +21,7 @@ class protectSpreadsheet(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #enter password
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ToolProtectionDocument") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ToolProtectionDocument") as xDialog:
             xpass1ed = xDialog.getChild("pass1ed")
             xconfirm1ed = xDialog.getChild("confirm1ed")
 
@@ -29,7 +29,7 @@ class protectSpreadsheet(UITestCase):
             xconfirm1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"}))
 
         #Verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ToolProtectionDocument", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ToolProtectionDocument", close_button="cancel") as xDialog:
             xpass1ed = xDialog.getChild("pass1ed")
 
             xpass1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"}))
diff --git a/sc/qa/uitest/range_name/create_range_name.py b/sc/qa/uitest/range_name/create_range_name.py
index 0118aba85191..98cba79d88c2 100644
--- a/sc/qa/uitest/range_name/create_range_name.py
+++ b/sc/qa/uitest/range_name/create_range_name.py
@@ -67,7 +67,7 @@ class CreateRangeNameTest(UITestCase):
         self.assertEqual(3.0, get_cell_by_position(document, 0, 0, 1).getValue())
 
         # Change the name
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
             xNamesList = xDialog.getChild('names')
             self.assertEqual(1, len(xNamesList.getChildren()))
 
@@ -120,7 +120,7 @@ class CreateRangeNameTest(UITestCase):
         # Use the name range in the current sheet
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertName", close_button="paste") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertName", close_button="paste") as xDialog:
 
             xCtrl = xDialog.getChild('ctrl')
             self.assertEqual(1, len(xCtrl.getChildren()))
@@ -135,13 +135,13 @@ class CreateRangeNameTest(UITestCase):
         self.assertEqual("=localRangeName", get_cell_by_position(document, 0, 1, 0).getFormula())
 
         # Insert a new sheet
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:Insert"):
             pass
 
         # Use the name range in the new sheet
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertName", close_button="paste") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertName", close_button="paste") as xDialog:
 
             xCtrl = xDialog.getChild('ctrl')
             self.assertEqual(1, len(xCtrl.getChildren()))
@@ -158,7 +158,7 @@ class CreateRangeNameTest(UITestCase):
         # and AssertionError: '=Sheet1.localRangeName' != '=localrangename'
         self.assertEqual("=Sheet1.localRangeName", get_cell_by_position(document, 0, 1, 0).getFormula())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
 
             # tdf#138851: Without the fix in place, this test would have failed with
             # AssertionError: 'Sheet1' != 'Document (Global)'
diff --git a/sc/qa/uitest/range_name/tdf137617.py b/sc/qa/uitest/range_name/tdf137617.py
index c0a84ba8cb03..44410bff6de3 100644
--- a/sc/qa/uitest/range_name/tdf137617.py
+++ b/sc/qa/uitest/range_name/tdf137617.py
@@ -25,7 +25,7 @@ class tdf137617(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B2"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:CreateNames") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog:
 
 
             # Only left is selected
@@ -45,7 +45,7 @@ class tdf137617(UITestCase):
         self.assertEqual('Result2', get_state_as_dict(xPosWindow)['Text'])
 
         # Change formula syntax to "Excel R1C1"
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')
@@ -62,7 +62,7 @@ class tdf137617(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:D2"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:CreateNames") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog:
 
 
             # Only top is selected
@@ -83,7 +83,7 @@ class tdf137617(UITestCase):
         self.assertEqual('Result4', get_state_as_dict(xPosWindow)['Text'])
 
         # Change formula syntax back to "Calc A1"
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')
diff --git a/sc/qa/uitest/search_replace/tdf39917.py b/sc/qa/uitest/search_replace/tdf39917.py
index 1f2445b5148b..3431b102af1b 100644
--- a/sc/qa/uitest/search_replace/tdf39917.py
+++ b/sc/qa/uitest/search_replace/tdf39917.py
@@ -23,7 +23,7 @@ class tdf39917(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
         #* Tools --> Options --> Calc --> Formula -->  Syntax = Excel R1C1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')                 # Calc
@@ -40,14 +40,14 @@ class tdf39917(UITestCase):
         # 2. Tools -> Options -> LibreOffice Calc -> Formula: Set syntax to Excel A1
         # 5. Fill fields:
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Insert") as xDialog:
             after = xDialog.getChild("after")
             after.executeAction("CLICK", tuple())
             nameed = xDialog.getChild("nameed")
             nameed.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             nameed.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
             nameed.executeAction("TYPE", mkPropertyValues({"TEXT":"Page2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Insert") as xDialog:
             after = xDialog.getChild("after")
             after.executeAction("CLICK", tuple())
             nameed = xDialog.getChild("nameed")
@@ -79,7 +79,7 @@ class tdf39917(UITestCase):
         enter_text_to_cell(gridwin, "A1", "=FORMULA(R[3]C[1])")
         self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "=Page3!RC")
         #Give it back Tools --> Options --> Calc --> Formula -->  Syntax = Calc A1
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xCalcEntry = xPages.getChild('3')                 # Calc
diff --git a/sc/qa/uitest/signatureLine/insertSignatureLine.py b/sc/qa/uitest/signatureLine/insertSignatureLine.py
index a668227e25da..7032858ef1c6 100644
--- a/sc/qa/uitest/signatureLine/insertSignatureLine.py
+++ b/sc/qa/uitest/signatureLine/insertSignatureLine.py
@@ -21,7 +21,7 @@ class insertSignatureLineCalc(UITestCase):
         document = self.ui_test.get_component()
 
         # cancel the dialog without doing anything
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine", close_button="cancel") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
@@ -30,7 +30,7 @@ class insertSignatureLineCalc(UITestCase):
             document.Sheets.getByIndex(0).DrawPage.getByIndex(0)
 
         # set the signature line
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xTitle = xDialog.getChild("edit_title")
@@ -61,7 +61,7 @@ class insertSignatureLineCalc(UITestCase):
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xTitle = xDialog.getChild("edit_title")
diff --git a/sc/qa/uitest/sort/naturalSort.py b/sc/qa/uitest/sort/naturalSort.py
index d48755ac1cc0..373fd8bbe3c0 100644
--- a/sc/qa/uitest/sort/naturalSort.py
+++ b/sc/qa/uitest/sort/naturalSort.py
@@ -29,7 +29,7 @@ class CalcNaturalSorting(UITestCase):
         enter_text_to_cell(gridwin, "A4", "MW180SSMOU456.994JIL4")
         enter_text_to_cell(gridwin, "A5", "MW101SSMOU456.996JIL4")
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xNatural = xDialog.getChild("naturalsort")
@@ -57,7 +57,7 @@ class CalcNaturalSorting(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "D1:D4"}))
 
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             xNatural = xDialog.getChild("naturalsort")
@@ -85,7 +85,7 @@ class CalcNaturalSorting(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:D1"}))
 
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             xleftright = xDialog.getChild("leftright")
             select_pos(xTabs, "1")
diff --git a/sc/qa/uitest/sort/sorting.py b/sc/qa/uitest/sort/sorting.py
index 5529dbb7301d..2c2c56fc2bf7 100644
--- a/sc/qa/uitest/sort/sorting.py
+++ b/sc/qa/uitest/sort/sorting.py
@@ -54,7 +54,7 @@ class CalcSorting(UITestCase):
         #Select cell A3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
         #Open sort dialog by DATA - SORT /Switch to tabpage Options
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             #Verify that option "Range contains column labels" is set
@@ -98,7 +98,7 @@ class CalcSorting(UITestCase):
         #Select cell B3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"}))
         #Open sort dialog by DATA - SORT /Switch to tabpage Options
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             #Verify that option "Range contains column labels" is not set
@@ -230,7 +230,7 @@ class CalcSorting(UITestCase):
         #Select cell A3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             #Verify that the first sort criteria is set to "Number(ascending)"
@@ -242,7 +242,7 @@ class CalcSorting(UITestCase):
         #Select cell B3
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             #Verify that the first sort criteria is set to "Misc (ascending)"
@@ -257,7 +257,7 @@ class CalcSorting(UITestCase):
         gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
         gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             #Verify that the first sort criteria is set to "Number(ascending)"
@@ -271,7 +271,7 @@ class CalcSorting(UITestCase):
         #Move the active cell inside the range to column B by using the TAB key
         gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             #Verify that the first sort criteria is set to "Misc (ascending)"
diff --git a/sc/qa/uitest/sort/subtotals.py b/sc/qa/uitest/sort/subtotals.py
index 63dd2675eacb..b48079a02ec8 100644
--- a/sc/qa/uitest/sort/subtotals.py
+++ b/sc/qa/uitest/sort/subtotals.py
@@ -32,14 +32,14 @@ class Subtotals(UITestCase):
         enter_text_to_cell(gridwin, "A8", "1")
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A9"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals"):
             pass
 
         self.assertEqual(get_cell_by_position(document, 0, 0, 7).getValue(), 1)
         self.assertEqual(get_cell_by_position(document, 0, 0, 8).getString(), "")
 
         # check cancel button
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals", close_button="cancel"):
             pass
 
         self.ui_test.close_doc()
@@ -54,7 +54,7 @@ class Subtotals(UITestCase):
             # Select from the menu bar Data
             # Select option subtotal
             # Subtotal dialog displays
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 # Select group by: Category
                 xGroupBy = xDialog.getChild("group_by")
                 select_by_text(xGroupBy, "Category")
@@ -76,11 +76,11 @@ class Subtotals(UITestCase):
             # 1 select all cells
             self.xUITest.executeCommand(".uno:SelectAll")#use uno command Menu Edit->Select All
             # 2 invoke sub-total menu and select none
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 xGroupBy = xDialog.getChild("group_by")
                 select_by_text(xGroupBy, "- none -")
             # 2 invoke sort menu and... crash
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel"):
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel"):
                 pass
 
             self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 8).getString(), "z")
@@ -92,7 +92,7 @@ class Subtotals(UITestCase):
             gridwin = XcalcDoc.getChild("grid_window")
             # 1. Open the test file
             # 2. Data->Subtotals
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 # 3. Group by->Trans date
                 xGroupBy = xDialog.getChild("group_by")
                 select_by_text(xGroupBy, "Trans Date")
@@ -103,7 +103,7 @@ class Subtotals(UITestCase):
                 xFirstEntry.executeAction("CLICK", tuple())
                 # 5. Click OK
             # 6. Data->Subtotals
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 # 7. Group by->-none-
                 xGroupBy = xDialog.getChild("group_by")
                 select_by_text(xGroupBy, "- none -")
@@ -114,7 +114,7 @@ class Subtotals(UITestCase):
                 xFirstEntry.executeAction("CLICK", tuple())
                 # 9. Click OK
             # 10. Data->Sort
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 # 11. Sort key 1->Post Date.
                 sortkey1 = xDialog.getChild("sortlb")
                 select_by_text(sortkey1, "Post Date")
@@ -132,7 +132,7 @@ class Subtotals(UITestCase):
             # 2. Place cursor in cell outside of subtotals range (e.g. B7)
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B7"}))
             # 3. Data → Subtotals
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog:
                 # 4. Group by: "- none -"
                 xGroupBy = xDialog.getChild("group_by")
                 select_by_text(xGroupBy, "- none -")
diff --git a/sc/qa/uitest/sort/tdf100517.py b/sc/qa/uitest/sort/tdf100517.py
index b02f5a7a641f..350d233f12f6 100644
--- a/sc/qa/uitest/sort/tdf100517.py
+++ b/sc/qa/uitest/sort/tdf100517.py
@@ -16,7 +16,7 @@ class tdf100517(UITestCase):
     def execute_sort_dialog(self, gridwin, bIncludeNotes):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
diff --git a/sc/qa/uitest/sort/tdf105301.py b/sc/qa/uitest/sort/tdf105301.py
index 7e9aa32f4803..c7747c680917 100644
--- a/sc/qa/uitest/sort/tdf105301.py
+++ b/sc/qa/uitest/sort/tdf105301.py
@@ -18,7 +18,7 @@ class tdf105301(UITestCase):
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:R9"}))
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "0")
                 self.assertEqual("Column B", get_state_as_dict(xDialog.getChild("sortlb"))['DisplayText'])
diff --git a/sc/qa/uitest/sort/tdf126678.py b/sc/qa/uitest/sort/tdf126678.py
index f6a13f2895bf..1a12a8b2bc7f 100644
--- a/sc/qa/uitest/sort/tdf126678.py
+++ b/sc/qa/uitest/sort/tdf126678.py
@@ -16,7 +16,7 @@ class tdf126678(UITestCase):
     def execute_sort_dialog(self, gridwin, bIncludeFormats):
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
diff --git a/sc/qa/uitest/sort/tdf49531.py b/sc/qa/uitest/sort/tdf49531.py
index 6dd77e6c7e13..1a919d5f4e3d 100644
--- a/sc/qa/uitest/sort/tdf49531.py
+++ b/sc/qa/uitest/sort/tdf49531.py
@@ -25,7 +25,7 @@ class tdf49531(UITestCase):
 
             #Menu 'Data -> Sort -> Top to bottom - all otheroptions unchecked
             #Column B - Ascending' <ok>
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 xNatural = xDialog.getChild("naturalsort")
diff --git a/sc/qa/uitest/sort/tdf53482.py b/sc/qa/uitest/sort/tdf53482.py
index 01671558754a..b54196e89997 100644
--- a/sc/qa/uitest/sort/tdf53482.py
+++ b/sc/qa/uitest/sort/tdf53482.py
@@ -23,7 +23,7 @@ class tdf53482(UITestCase):
             #1. Highlight cells to be sorted A8:J124
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A8:J124"}))
             #2. Click Data menu, Sort
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 #3. On Options tab, tick 'Range contains column labels'
@@ -57,7 +57,7 @@ class tdf53482(UITestCase):
         #1. Highlight cells to be sorted
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"}))
         #2. Click Data menu, Sort
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             #3. On Options tab, tick 'Range contains column labels'
diff --git a/sc/qa/uitest/sort/tdf54018.py b/sc/qa/uitest/sort/tdf54018.py
index 62cea8d2e961..396fe5a74ddd 100644
--- a/sc/qa/uitest/sort/tdf54018.py
+++ b/sc/qa/uitest/sort/tdf54018.py
@@ -23,7 +23,7 @@ class tdf54018(UITestCase):
             #click top left columns / rows heading field to select all cells
             self.xUITest.executeCommand(".uno:SelectAll")
             #Menu 'Data -> Sort -> Column D -> Descending' <ok>
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "0")
                 xSortKey1 = xDialog.getChild("sortlb")
diff --git a/sc/qa/uitest/sort/tdf57465.py b/sc/qa/uitest/sort/tdf57465.py
index 8f40df5d704b..4028b18bda55 100644
--- a/sc/qa/uitest/sort/tdf57465.py
+++ b/sc/qa/uitest/sort/tdf57465.py
@@ -19,7 +19,7 @@ class tdf57465(UITestCase):
 
             gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:G4"}))
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
 
diff --git a/sc/qa/uitest/sort/tdf91305.py b/sc/qa/uitest/sort/tdf91305.py
index e3699c05de6a..481d429c2531 100644
--- a/sc/qa/uitest/sort/tdf91305.py
+++ b/sc/qa/uitest/sort/tdf91305.py
@@ -52,7 +52,7 @@ class tdf91305(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C1"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             xleftright = xDialog.getChild("leftright")
             select_pos(xTabs, "1")
@@ -62,7 +62,7 @@ class tdf91305(UITestCase):
         self.assertEqual(get_cell_by_position(document, 0, 1, 0).getString(), "cc")
         self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(), "ff")
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             xleftright = xDialog.getChild("leftright")
             xdown = xDialog.getChild("down")
diff --git a/sc/qa/uitest/sort/tdf95192.py b/sc/qa/uitest/sort/tdf95192.py
index 35dfd44f4183..71af9e2a5d63 100644
--- a/sc/qa/uitest/sort/tdf95192.py
+++ b/sc/qa/uitest/sort/tdf95192.py
@@ -21,7 +21,7 @@ class tdf95192(UITestCase):
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
             #Open sort dialog by DATA - SORT
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 xNatural = xDialog.getChild("naturalsort")
diff --git a/sc/qa/uitest/sort/tdf99208.py b/sc/qa/uitest/sort/tdf99208.py
index 28cce8bb7a54..c754e00dc187 100644
--- a/sc/qa/uitest/sort/tdf99208.py
+++ b/sc/qa/uitest/sort/tdf99208.py
@@ -24,7 +24,7 @@ class tdf99208(UITestCase):
 
             #Menu 'Data -> Sort
             #Column A - Ascending' <ok>
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 xNatural = xDialog.getChild("naturalsort")
diff --git a/sc/qa/uitest/sort/tdf99627.py b/sc/qa/uitest/sort/tdf99627.py
index 5f40a2d00b99..f0509210cac8 100644
--- a/sc/qa/uitest/sort/tdf99627.py
+++ b/sc/qa/uitest/sort/tdf99627.py
@@ -22,7 +22,7 @@ class tdf99627(UITestCase):
             gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
             #Open sort dialog by DATA - SORT
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 xNatural = xDialog.getChild("naturalsort")
diff --git a/sc/qa/uitest/sort/tdf99773.py b/sc/qa/uitest/sort/tdf99773.py
index 9647278a1f5b..0d5f61a308ac 100644
--- a/sc/qa/uitest/sort/tdf99773.py
+++ b/sc/qa/uitest/sort/tdf99773.py
@@ -31,7 +31,7 @@ class tdf99773(UITestCase):
 
         gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A6"}))
         #Open sort dialog by DATA - SORT
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             xNatural = xDialog.getChild("naturalsort")
diff --git a/sc/qa/uitest/validity/tdf137945.py b/sc/qa/uitest/validity/tdf137945.py
index 349bff23577e..41d491728bb2 100644
--- a/sc/qa/uitest/validity/tdf137945.py
+++ b/sc/qa/uitest/validity/tdf137945.py
@@ -13,7 +13,7 @@ class Tdf137945(UITestCase):
     def test_tdf137945(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf137945.ods")) as calc_doc:
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
                 xInput = xDialog.getChild("inputhelp")
diff --git a/sc/qa/uitest/validity/tdf138134.py b/sc/qa/uitest/validity/tdf138134.py
index f104fc3bfc84..c39529b78154 100644
--- a/sc/qa/uitest/validity/tdf138134.py
+++ b/sc/qa/uitest/validity/tdf138134.py
@@ -26,7 +26,7 @@ class DetectiveCircle(UITestCase):
         #Select the cells to be validated
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
         #Apply Data > Validity ... > Whole Numbers
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
diff --git a/sc/qa/uitest/validity/tdf53920.py b/sc/qa/uitest/validity/tdf53920.py
index ca651eb0cfbb..82687900c3b0 100644
--- a/sc/qa/uitest/validity/tdf53920.py
+++ b/sc/qa/uitest/validity/tdf53920.py
@@ -29,7 +29,7 @@ class tdf53920(UITestCase):
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3", "EXTEND":"1"}))
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5", "EXTEND":"1"}))
         #Apply Data > Validity ... > Cell Range
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -40,21 +40,21 @@ class tdf53920(UITestCase):
 
         #Expected behavior: All selected cells validate data.
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xmin = xDialog.getChild("min")
             self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range")
             self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xmin = xDialog.getChild("min")
             self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range")
             self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3")
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xmin = xDialog.getChild("min")
             self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range")
diff --git a/sc/qa/uitest/validity/tdf65686.py b/sc/qa/uitest/validity/tdf65686.py
index 83d691026968..04e0955c352c 100644
--- a/sc/qa/uitest/validity/tdf65686.py
+++ b/sc/qa/uitest/validity/tdf65686.py
@@ -23,7 +23,7 @@ class tdf65686(UITestCase):
         #- Select Allow List
         #- Enter Entries Aap Noot Mies
         #- OK
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -38,7 +38,7 @@ class tdf65686(UITestCase):
             minlist.executeAction("TYPE", mkPropertyValues({"TEXT":"Mies"}))
         #- again open Data > Validity
         #> there are empty lines in the list Entries
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             minlist = xDialog.getChild("minlist")
diff --git a/sc/qa/uitest/validity/tdf96698.py b/sc/qa/uitest/validity/tdf96698.py
index 007967410e49..fcea7464ea96 100644
--- a/sc/qa/uitest/validity/tdf96698.py
+++ b/sc/qa/uitest/validity/tdf96698.py
@@ -22,7 +22,7 @@ class tdf96698(UITestCase):
         #A general validity check for the entered new content of the active cell - especially for text
         #with a custom formula like in Excel is not possible.
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -32,7 +32,7 @@ class tdf96698(UITestCase):
             select_by_text(xallow, "Custom")
             xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"ISERROR(FIND(\",\",B2))"}))
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             xmin = xDialog.getChild("min")
@@ -42,7 +42,7 @@ class tdf96698(UITestCase):
 
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -52,7 +52,7 @@ class tdf96698(UITestCase):
             select_by_text(xallow, "Custom")
             xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"NOT(ISERROR(B3))"}))
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             xmin = xDialog.getChild("min")
@@ -62,7 +62,7 @@ class tdf96698(UITestCase):
 
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A7"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -72,7 +72,7 @@ class tdf96698(UITestCase):
             select_by_text(xallow, "Custom")
             xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"ISERROR(FIND(\",\",A7))"}))
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             xmin = xDialog.getChild("min")
@@ -82,7 +82,7 @@ class tdf96698(UITestCase):
 
 
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A8"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -92,7 +92,7 @@ class tdf96698(UITestCase):
             select_by_text(xallow, "Custom")
             xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"NOT(ISERROR(A8))"}))
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             xmin = xDialog.getChild("min")
diff --git a/sc/qa/uitest/validity/validity.py b/sc/qa/uitest/validity/validity.py
index a10999c8a9fb..3ac4f790c6cc 100644
--- a/sc/qa/uitest/validity/validity.py
+++ b/sc/qa/uitest/validity/validity.py
@@ -20,7 +20,7 @@ class validity(UITestCase):
         document = self.ui_test.get_component()
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xallow = xDialog.getChild("allow")
@@ -35,7 +35,7 @@ class validity(UITestCase):
             xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
             xmax.executeAction("TYPE", mkPropertyValues({"TEXT":"2"}))
         #reopen and verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation", close_button="cancel") as xDialog:
             xallow = xDialog.getChild("allow")
             xallowempty = xDialog.getChild("allowempty")
             xdata = xDialog.getChild("data")
@@ -58,7 +58,7 @@ class validity(UITestCase):
         document = self.ui_test.get_component()
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             xtsbhelp = xDialog.getChild("tsbhelp")
@@ -69,7 +69,7 @@ class validity(UITestCase):
             xtitle.executeAction("TYPE", mkPropertyValues({"TEXT":"A"}))
             xinputhelp.executeAction("TYPE", mkPropertyValues({"TEXT":"B"}))
         #reopen and verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             xtsbhelp = xDialog.getChild("tsbhelp")
             xtitle = xDialog.getChild("title")
@@ -90,7 +90,7 @@ class validity(UITestCase):
         document = self.ui_test.get_component()
         gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -102,7 +102,7 @@ class validity(UITestCase):
             xerroralerttitle.executeAction("TYPE", mkPropertyValues({"TEXT":"Warn"}))
             xerrorMsg.executeAction("TYPE", mkPropertyValues({"TEXT":"Warn2"}))
         #reopen and verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index d4bc3c5392a9..a8135bca4831 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -20,7 +20,7 @@ class autocorrectOptions(UITestCase):
         self.ui_test.close_dialog_through_button(xCancelBtn)
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")       #tab replace
             origtext = xDialog.getChild("origtext")
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py b/sd/qa/uitest/impress_tests/customSlideShow.py
index 688fb01f5685..6af8ff60a20f 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -14,7 +14,7 @@ class customSlideShow(UITestCase):
         TemplateDialog = self.xUITest.getTopFocusWindow()
         cancel = TemplateDialog.getChild("close")
         self.ui_test.close_dialog_through_button(cancel)
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:CustomShowDialog") as CustomSlideShows:
+        with self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog") as CustomSlideShows:
             new = CustomSlideShows.getChild("new")
 
             with self.ui_test.execute_blocking_action(new.executeAction, args=('CLICK', ())) as DefineCustomSlideShow:
@@ -29,7 +29,7 @@ class customSlideShow(UITestCase):
                 add.executeAction("CLICK",tuple())
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:CustomShowDialog") as CustomSlideShows:
+        with self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog") as CustomSlideShows:
             edit = CustomSlideShows.getChild("edit")
             customshowlist = CustomSlideShows.getChild("customshowlist")
             self.assertEqual(get_state_as_dict(customshowlist)["SelectionCount"], "1")
diff --git a/sd/qa/uitest/impress_tests/masterElements.py b/sd/qa/uitest/impress_tests/masterElements.py
index 6dedb805efa2..3ed174c47f20 100644
--- a/sd/qa/uitest/impress_tests/masterElements.py
+++ b/sd/qa/uitest/impress_tests/masterElements.py
@@ -20,7 +20,7 @@ class masterElements(UITestCase):
         self.ui_test.close_dialog_through_button(xCancelBtn)
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MasterLayouts") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:MasterLayouts") as xDialog:
 
             xpagenumber = xDialog.getChild("pagenumber")
             xfooter = xDialog.getChild("footer")
@@ -31,7 +31,7 @@ class masterElements(UITestCase):
 
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MasterLayouts") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:MasterLayouts") as xDialog:
             xfooter = xDialog.getChild("footer")
             datetime = xDialog.getChild("datetime")
             xpagenumber = xDialog.getChild("pagenumber")
diff --git a/sd/qa/uitest/impress_tests/masterSlides.py b/sd/qa/uitest/impress_tests/masterSlides.py
index 3bea28a90b6e..da4e3e949f4b 100644
--- a/sd/qa/uitest/impress_tests/masterSlides.py
+++ b/sd/qa/uitest/impress_tests/masterSlides.py
@@ -31,7 +31,7 @@ class masterSlides(UITestCase):
         xCloseMasterButton = xImpress.getChild("closemasterslide")
         xCloseMasterButton.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PresentationLayout") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PresentationLayout") as xDialog:
 
             xSelect = xDialog.getChild('select')
             xSelect.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
diff --git a/sd/qa/uitest/impress_tests/renameSlide.py b/sd/qa/uitest/impress_tests/renameSlide.py
index afb053e44a24..bd082aa91055 100644
--- a/sd/qa/uitest/impress_tests/renameSlide.py
+++ b/sd/qa/uitest/impress_tests/renameSlide.py
@@ -16,21 +16,21 @@ class renameSlide(UITestCase):
         xCancelBtn = xTemplateDlg.getChild("close")
         self.ui_test.close_dialog_through_button(xCancelBtn)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenamePage") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenamePage") as xDialog:
 
             name_entry = xDialog.getChild("name_entry")
             name_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"}))
 
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenamePage") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenamePage") as xDialog:
 
             name_entry = xDialog.getChild("name_entry")
             self.assertEqual(get_state_as_dict(name_entry)["Text"], "NewName")
 
         self.xUITest.executeCommand(".uno:InsertPage")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:RenamePage", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:RenamePage", close_button="cancel") as xDialog:
 
             xOKBtn = xDialog.getChild("ok")
             self.assertEqual("true", get_state_as_dict(xOKBtn)['Enabled'])
diff --git a/sd/qa/uitest/impress_tests/slideShowSettings.py b/sd/qa/uitest/impress_tests/slideShowSettings.py
index 8d064c895b6b..73f840beabbd 100644
--- a/sd/qa/uitest/impress_tests/slideShowSettings.py
+++ b/sd/qa/uitest/impress_tests/slideShowSettings.py
@@ -14,7 +14,7 @@ class slideShowSettings(UITestCase):
         cancel = TemplateDialog.getChild("close")
         self.ui_test.close_dialog_through_button(cancel)
         self.xUITest.executeCommand(".uno:InsertPage")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PresentationDialog") as PresentationDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PresentationDialog") as PresentationDialog:
 
             xfrom = PresentationDialog.getChild("from")
             xfrom.executeAction("CLICK",tuple())
@@ -34,7 +34,7 @@ class slideShowSettings(UITestCase):
             changeslidesbyclick.executeAction("CLICK",tuple())
 
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PresentationDialog", close_button="cancel") as PresentationDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PresentationDialog", close_button="cancel") as PresentationDialog:
             xfrom = PresentationDialog.getChild("from")
             self.assertEqual(get_state_as_dict(xfrom)["Checked"], "true")
             from_cb = PresentationDialog.getChild("from_cb")
diff --git a/sd/qa/uitest/impress_tests/tdf125449.py b/sd/qa/uitest/impress_tests/tdf125449.py
index 206a9a88eae6..2ec26db5b907 100644
--- a/sd/qa/uitest/impress_tests/tdf125449.py
+++ b/sd/qa/uitest/impress_tests/tdf125449.py
@@ -18,7 +18,7 @@ class tdf125449(UITestCase):
         xCancelBtn = xTemplateDlg.getChild("close")
         self.ui_test.close_dialog_through_button(xCancelBtn)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as xPageSetupDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as xPageSetupDlg:
 
             tabcontrol = xPageSetupDlg.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
diff --git a/sd/qa/uitest/impress_tests/tdf134734.py b/sd/qa/uitest/impress_tests/tdf134734.py
index b5db370c7f76..0fc0bf85fd7b 100644
--- a/sd/qa/uitest/impress_tests/tdf134734.py
+++ b/sd/qa/uitest/impress_tests/tdf134734.py
@@ -20,7 +20,7 @@ class TestClass(UITestCase):
         self.ui_test.close_dialog_through_button(close)
 
         # set margins and fill color
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
@@ -56,7 +56,7 @@ class TestClass(UITestCase):
           document.MasterPages.getByIndex(0).BackgroundFullSize, False)
 
         # check it
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
@@ -77,7 +77,7 @@ class TestClass(UITestCase):
           document.MasterPages.getByIndex(0).BackgroundFullSize, True)
 
         # uncheck it again
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
diff --git a/sd/qa/uitest/impress_tests/tdf137729.py b/sd/qa/uitest/impress_tests/tdf137729.py
index 49b96d042f2e..3d08734eed5c 100644
--- a/sd/qa/uitest/impress_tests/tdf137729.py
+++ b/sd/qa/uitest/impress_tests/tdf137729.py
@@ -19,7 +19,7 @@ class tdf137729(UITestCase):
         xCancelBtn = xTemplateDlg.getChild("close")
         self.ui_test.close_dialog_through_button(xCancelBtn)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as xPageSetupDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as xPageSetupDlg:
 
             tabcontrol = xPageSetupDlg.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
diff --git a/sd/qa/uitest/impress_tests/tdf139511.py b/sd/qa/uitest/impress_tests/tdf139511.py
index bc12360eed29..f02ba76b1c40 100644
--- a/sd/qa/uitest/impress_tests/tdf139511.py
+++ b/sd/qa/uitest/impress_tests/tdf139511.py
@@ -25,7 +25,7 @@ class tdf139511(UITestCase):
         self.assertEqual(8004, document.DrawPages[0].getByIndex(2).BoundRect.Height)
         self.assertEqual(14104, document.DrawPages[0].getByIndex(2).BoundRect.Width)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
 
 
             xWidth = xDialog.getChild('MTR_FLD_WIDTH')
diff --git a/sd/qa/uitest/impress_tests/tdf141297.py b/sd/qa/uitest/impress_tests/tdf141297.py
index da15efda1dc9..dd452699364e 100644
--- a/sd/qa/uitest/impress_tests/tdf141297.py
+++ b/sd/qa/uitest/impress_tests/tdf141297.py
@@ -21,7 +21,7 @@ class tdf141297(UITestCase):
         xCancelBtn = xTemplateDlg.getChild("close")
         self.ui_test.close_dialog_through_button(xCancelBtn)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertGraphic", close_button="open") as xOpenDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", close_button="open") as xOpenDialog:
 
 
             xFileName = xOpenDialog.getChild("file_name")
@@ -38,7 +38,7 @@ class tdf141297(UITestCase):
         xOK = xWarnDialog.getChild("ok")
         self.ui_test.close_dialog_through_button(xOK)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ManageLinks", close_button="close") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ManageLinks", close_button="close") as xDialog:
 
 
             sLinks = "TB_LINKS"
@@ -61,7 +61,7 @@ class tdf141297(UITestCase):
             xFilePath = os.path.join(tempdir, "tdf141297-tmp.odp")
 
             # Save Copy as
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SaveAs", close_button="open") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SaveAs", close_button="open") as xDialog:
 
                 xFileName = xDialog.getChild("file_name")
                 xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py b/sd/qa/uitest/impress_tests/tdf91762.py
index 7f732c97f187..897af11908cc 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -18,7 +18,7 @@ class tdf91762(UITestCase):
 
         self.xUITest.executeCommand(".uno:AssignLayout?WhatLayout:long=1")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
             self.assertEqual('5', get_state_as_dict(xDialog.getChild('columns'))['Text'])
             self.assertEqual('2', get_state_as_dict(xDialog.getChild('rows'))['Text'])
 
diff --git a/sd/qa/uitest/impress_tests/textColumnsDialog.py b/sd/qa/uitest/impress_tests/textColumnsDialog.py
index d2119dbb37ce..7a19f0258327 100644
--- a/sd/qa/uitest/impress_tests/textColumnsDialog.py
+++ b/sd/qa/uitest/impress_tests/textColumnsDialog.py
@@ -31,7 +31,7 @@ class textColumnsDialog(UITestCase):
             self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
 
             # Test defaults and set some values
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextAttributes") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextAttributes") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "2")
                 colNumber = xDialog.getChild('FLD_COL_NUMBER')
@@ -42,7 +42,7 @@ class textColumnsDialog(UITestCase):
                 colSpacing.executeAction("SET", mkPropertyValues({"TEXT": "1.5"}))
 
             # Test that settings persist
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextAttributes") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextAttributes") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "2")
                 colNumber = xDialog.getChild('FLD_COL_NUMBER')
diff --git a/sfx2/qa/uitest/doc/objserv.py b/sfx2/qa/uitest/doc/objserv.py
index 67c4765d4840..627469ae9323 100644
--- a/sfx2/qa/uitest/doc/objserv.py
+++ b/sfx2/qa/uitest/doc/objserv.py
@@ -16,7 +16,7 @@ class Test(UITestCase):
         with self.ui_test.load_file(get_url_for_data_file("pdf-sign.pdf")) as impress_doc:
 
             # Now use File -> Digital signatures -> Digital signatures.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:Signature", close_button="close"):
+            with self.ui_test.execute_dialog_through_command(".uno:Signature", close_button="close"):
                 # Without the accompanying fix in place, this test would have failed with:
                 # uno.com.sun.star.uno.RuntimeException: Could not find child with id: close vcl/source/uitest/uiobject.cxx:452
                 pass
diff --git a/svx/qa/uitest/table/tablecontroller.py b/svx/qa/uitest/table/tablecontroller.py
index 1b6989f039dd..20a88ddf8268 100644
--- a/svx/qa/uitest/table/tablecontroller.py
+++ b/svx/qa/uitest/table/tablecontroller.py
@@ -22,7 +22,7 @@ class SvxTableControllerTest(UITestCase):
         self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2")
 
         # Enable shadow.
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as tableDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog:
             tabs = tableDialog.getChild("tabcontrol")
             # Select "shadow".
             select_pos(tabs, "4")
@@ -59,7 +59,7 @@ class SvxTableControllerTest(UITestCase):
             impress.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+TAB"}))
         impress.executeAction("TYPE", mkPropertyValues({"TEXT": "A3"}))
         self.xUITest.executeCommand(".uno:SelectAll")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as tableDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog:
             tabs = tableDialog.getChild("tabcontrol")
             # Select "shadow".
             select_pos(tabs, "4")
diff --git a/sw/qa/uitest/chapterNumbering/chapterNumbering.py b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
index 8b3de300b862..6c34a722c833 100644
--- a/sw/qa/uitest/chapterNumbering/chapterNumbering.py
+++ b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
@@ -22,7 +22,7 @@ class WriterChapterNumbering(UITestCase):
 
         change_measurement_unit(self, "Millimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog:
             xstyle = xDialog.getChild("style")
             xnumbering = xDialog.getChild("numbering")
             xcharstyle = xDialog.getChild("charstyle")
@@ -52,7 +52,7 @@ class WriterChapterNumbering(UITestCase):
             xindentatmf.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog", close_button="cancel") as xDialog:
 
             xstyle = xDialog.getChild("style")
             xnumbering = xDialog.getChild("numbering")
diff --git a/sw/qa/uitest/chapterNumbering/tdf123547.py b/sw/qa/uitest/chapterNumbering/tdf123547.py
index c7ed6ef08978..81605eb75d5c 100644
--- a/sw/qa/uitest/chapterNumbering/tdf123547.py
+++ b/sw/qa/uitest/chapterNumbering/tdf123547.py
@@ -15,7 +15,7 @@ class tdf123547(UITestCase):
         with self.ui_test.load_file(get_url_for_data_file("tdf123547.docx")) as writer_doc:
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "1")
             #verify we didn't crash
diff --git a/sw/qa/uitest/chapterNumbering/tdf140528.py b/sw/qa/uitest/chapterNumbering/tdf140528.py
index 305cb18443a0..dc83265899ef 100644
--- a/sw/qa/uitest/chapterNumbering/tdf140528.py
+++ b/sw/qa/uitest/chapterNumbering/tdf140528.py
@@ -16,7 +16,7 @@ class Tdf140528(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog:
 
             xTab = xDialog.getChild("tabcontrol")
             select_pos(xTab, "0")
diff --git a/sw/qa/uitest/classification/classification.py b/sw/qa/uitest/classification/classification.py
index fbe7e9b093df..e3b4a41e2c99 100644
--- a/sw/qa/uitest/classification/classification.py
+++ b/sw/qa/uitest/classification/classification.py
@@ -41,7 +41,7 @@ class classification(UITestCase):
         writer_doc = self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ClassificationDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ClassificationDialog") as xDialog:
             classificationEditWindow = xDialog.getChild("classificationEditWindow")
             recentlyUsedCB = xDialog.getChild("recentlyUsedCB")
             classificationCB = xDialog.getChild("classificationCB")
@@ -63,7 +63,7 @@ class classification(UITestCase):
 
         #verify watermark
         #Bug 122586 - Classification: by using the dialog, Watermark text from policy is not placed in the document
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog:
             xTextInput = xDialog.getChild("TextInput")
             xAngle = xDialog.getChild("Angle")
             xTransparency = xDialog.getChild("Transparency")
@@ -77,7 +77,7 @@ class classification(UITestCase):
         #reopen and verify classification and Content
 
         #do the same for Paragraph classification
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog:
             classificationEditWindow = xDialog.getChild("classificationEditWindow")
             recentlyUsedCB = xDialog.getChild("recentlyUsedCB")
             classificationCB = xDialog.getChild("classificationCB")
@@ -104,7 +104,7 @@ class classification(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #+ new file and do it only for Paragraph classification (no watermark!)
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog:
             classificationEditWindow = xDialog.getChild("classificationEditWindow")
             recentlyUsedCB = xDialog.getChild("recentlyUsedCB")
             classificationCB = xDialog.getChild("classificationCB")
@@ -132,7 +132,7 @@ class classification(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #+ new file and do it only for Paragraph classification (no watermark!)
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog:
             classificationEditWindow = xDialog.getChild("classificationEditWindow")
             recentlyUsedCB = xDialog.getChild("recentlyUsedCB")
             classificationCB = xDialog.getChild("classificationCB")
diff --git a/sw/qa/uitest/findReplace/tdf118208.py b/sw/qa/uitest/findReplace/tdf118208.py
index 3d1f6e072f7b..b5abcfc83af0 100644
--- a/sw/qa/uitest/findReplace/tdf118208.py
+++ b/sw/qa/uitest/findReplace/tdf118208.py
@@ -20,7 +20,7 @@ class tdf118208(UITestCase):
             # 2. Press ctrl-H to show the search and replace dialog.
             # 3. Press the "Format..."  button.
             #Libreoffice immediately crashed.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
                 xPages = xDialog.getChild("pages")
                 xLanguageEntry = xPages.getChild('2')                 # Language Settings
@@ -50,7 +50,7 @@ class tdf118208(UITestCase):
             self.ui_test.close_dialog_through_button(xcloseBtn)
 
             #enable lang support again
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
                 xPages = xDialog.getChild("pages")
                 xLanguageEntry = xPages.getChild('2')                 # Language Settings
diff --git a/sw/qa/uitest/macro_tests/tdf124413.py b/sw/qa/uitest/macro_tests/tdf124413.py
index ad5a5cf47cfa..a81faffbb34f 100644
--- a/sw/qa/uitest/macro_tests/tdf124413.py
+++ b/sw/qa/uitest/macro_tests/tdf124413.py
@@ -14,7 +14,7 @@ class tdf124413(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
         #Start LibreOffice. Go to Tools > Macros > Organize Macros > Basic
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="") as xDialog:
             #Open Editor
             xEditBtn = xDialog.getChild("edit")
             xEditBtn.executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/macro_tests/tdf64690.py b/sw/qa/uitest/macro_tests/tdf64690.py
index 318d3e8772d4..26a7bc949131 100644
--- a/sw/qa/uitest/macro_tests/tdf64690.py
+++ b/sw/qa/uitest/macro_tests/tdf64690.py
@@ -15,7 +15,7 @@ class tdf64690(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="edit"):
+        with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="edit"):
             pass
 
         xMacroWin = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/navigator/tdf140257.py b/sw/qa/uitest/navigator/tdf140257.py
index 77623bef9649..24bc177d47d7 100644
--- a/sw/qa/uitest/navigator/tdf140257.py
+++ b/sw/qa/uitest/navigator/tdf140257.py
@@ -14,7 +14,7 @@ class Tdf140257(UITestCase):
 
   def change_outline_level(self, sText):
 
-    with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+    with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
         xTabs = xDialog.getChild("tabcontrol")
         select_pos(xTabs, "4")
 
diff --git a/sw/qa/uitest/navigator/tdf40427.py b/sw/qa/uitest/navigator/tdf40427.py
index 410aa2564d5d..3192dc71d2c1 100644
--- a/sw/qa/uitest/navigator/tdf40427.py
+++ b/sw/qa/uitest/navigator/tdf40427.py
@@ -21,7 +21,7 @@ class tdf40427(UITestCase):
         self.assertEqual(2, document.CurrentController.PageCount)
 
         # Make sure that the view is 2 pages side-by-side - look at dialog View-Zoom-Zoom
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
 
             columnssb = xDialog.getChild("columnssb")
             columns = xDialog.getChild("columns")
diff --git a/sw/qa/uitest/options/optionsDialog.py b/sw/qa/uitest/options/optionsDialog.py
index 2951892b7143..c7bbcf71ec49 100644
--- a/sw/qa/uitest/options/optionsDialog.py
+++ b/sw/qa/uitest/options/optionsDialog.py
@@ -11,7 +11,7 @@ class optionsDialog(UITestCase):
     def test_moreIconsDialog(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
             xPages = xDialog.getChild("pages")
             xLOEntry = xPages.getChild('0')
@@ -32,7 +32,7 @@ class optionsDialog(UITestCase):
     def test_tdf138596(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
             xPages = xDialog.getChild("pages")
             xWriterEntry = xPages.getChild('3')
             xWriterEntry.executeAction("EXPAND", tuple())
diff --git a/sw/qa/uitest/options/tdf131581.py b/sw/qa/uitest/options/tdf131581.py
index 1ca7eb42133c..0c59f076cdf3 100644
--- a/sw/qa/uitest/options/tdf131581.py
+++ b/sw/qa/uitest/options/tdf131581.py
@@ -14,7 +14,7 @@ class tdf131581(UITestCase):
 
         self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
 
             xPages = xDialogOpt.getChild("pages")
             xLOEntry = xPages.getChild('0')
diff --git a/sw/qa/uitest/options/tdf78133.py b/sw/qa/uitest/options/tdf78133.py
index 4c5803a90247..ac71e642d062 100644
--- a/sw/qa/uitest/options/tdf78133.py
+++ b/sw/qa/uitest/options/tdf78133.py
@@ -19,7 +19,7 @@ class tdf78133(UITestCase):
         document = self.ui_test.get_component()
         #New text document
         #open option, go to App colors
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
             xPages = xDialog.getChild("pages")
             xLOEntry = xPages.getChild('0')                 # Lo Dev
@@ -30,7 +30,7 @@ class tdf78133(UITestCase):
             docboundaries = xDialog.getChild("docboundaries")
             docboundaries.executeAction("CLICK", tuple())
         #verify - reopen dialog and check if "text boundaries" is still unchecked
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
             xPages = xDialog.getChild("pages")
             xLOEntry = xPages.getChild('0')                 # Lo Dev
diff --git a/sw/qa/uitest/sidebar/stylesSidebar.py b/sw/qa/uitest/sidebar/stylesSidebar.py
index b04869036902..96793b13b4c1 100644
--- a/sw/qa/uitest/sidebar/stylesSidebar.py
+++ b/sw/qa/uitest/sidebar/stylesSidebar.py
@@ -14,7 +14,7 @@ class StylesSidebar(UITestCase):
    def test_load_styles_from_template(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:LoadStyles", close_button="") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:LoadStyles", close_button="") as xDialog:
             xText = xDialog.getChild("text")
             xNumbering = xDialog.getChild("numbering")
             xFrame = xDialog.getChild("frame")
diff --git a/sw/qa/uitest/sidebar/tdf133189.py b/sw/qa/uitest/sidebar/tdf133189.py
index a48726467a8a..978358f0c2fe 100644
--- a/sw/qa/uitest/sidebar/tdf133189.py
+++ b/sw/qa/uitest/sidebar/tdf133189.py
@@ -28,7 +28,7 @@ class tdf133189(UITestCase):
         #change measurement to Inches
         change_measurement_unit(self, 'Inch')
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
 
diff --git a/sw/qa/uitest/sidebar/tdf135590.py b/sw/qa/uitest/sidebar/tdf135590.py
index 16ce0e7b1c16..b2a86700b5d3 100644
--- a/sw/qa/uitest/sidebar/tdf135590.py
+++ b/sw/qa/uitest/sidebar/tdf135590.py
@@ -17,7 +17,7 @@ class tdf135590(UITestCase):
         #change measurement to Centimeter
         change_measurement_unit(self, 'Centimeter')
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope") as xDialog:
 
 
             tabcontrol = xDialog.getChild("tabcontrol")
@@ -37,7 +37,7 @@ class tdf135590(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
 
diff --git a/sw/qa/uitest/styleInspector/styleInspector.py b/sw/qa/uitest/styleInspector/styleInspector.py
index 1d335de070c0..26e5c5be73a3 100644
--- a/sw/qa/uitest/styleInspector/styleInspector.py
+++ b/sw/qa/uitest/styleInspector/styleInspector.py
@@ -333,7 +333,7 @@ class styleNavigator(UITestCase):
 
             # FIXME: neither LO_EXT_SHADING, nor odf:prefix/odf:suffix changes update the View,
             # so add a temporary bookmark to the text range to trigger the color change immediately
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"):
+            with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"):
                 pass
 
             self.xUITest.executeCommand(".uno:Undo")
diff --git a/sw/qa/uitest/table/insertTableDialog.py b/sw/qa/uitest/table/insertTableDialog.py
index ac4d45a10fc4..2bea520282c6 100644
--- a/sw/qa/uitest/table/insertTableDialog.py
+++ b/sw/qa/uitest/table/insertTableDialog.py
@@ -14,7 +14,7 @@ class WriterInsertTableDialog(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
 
             xNameEdit = xDialog.getChild("nameedit")
 
@@ -49,14 +49,14 @@ class WriterInsertTableDialog(UITestCase):
 
         self.insert_table("Test3", 2, 2)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TableNumberFormatDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:TableNumberFormatDialog"):
             pass
 
         self.ui_test.close_doc()
 
     def test_cancel_button_insert_table_dialog(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable", close_button="cancel"):
             pass
 
         document = self.ui_test.get_component()
diff --git a/sw/qa/uitest/table/splitTable.py b/sw/qa/uitest/table/splitTable.py
index ee020ba7324e..cc4c48f28332 100644
--- a/sw/qa/uitest/table/splitTable.py
+++ b/sw/qa/uitest/table/splitTable.py
@@ -17,7 +17,7 @@ class splitTable(UITestCase):
             self.xUITest.executeCommand(".uno:GoDown")
             self.xUITest.executeCommand(".uno:GoDown")
             #dialog Split table, check Copy heading, OK -> verify 2 tables, 1st has 2 rows, second has 5 rows
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog:
 
                 copyheading = xDialog.getChild("copyheading")
                 copyheading.executeAction("CLICK", tuple())
@@ -35,7 +35,7 @@ class splitTable(UITestCase):
             #go to row 2
             self.xUITest.executeCommand(".uno:GoDown")
             self.xUITest.executeCommand(".uno:GoDown")
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog:
 
                 customheading = xDialog.getChild("customheading")
                 customheading.executeAction("CLICK", tuple())
@@ -53,7 +53,7 @@ class splitTable(UITestCase):
             #go to row 2
             self.xUITest.executeCommand(".uno:GoDown")
             self.xUITest.executeCommand(".uno:GoDown")
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog:
 
                 noheading = xDialog.getChild("noheading")
                 noheading.executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/table/tableProperties.py b/sw/qa/uitest/table/tableProperties.py
index ddc817630f9a..86656c45419b 100644
--- a/sw/qa/uitest/table/tableProperties.py
+++ b/sw/qa/uitest/table/tableProperties.py
@@ -21,7 +21,7 @@ class tableProperties(UITestCase):
             change_measurement_unit(self, "Centimeter")
 
             #dialog Table Properties - Table
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "0")
 
@@ -55,7 +55,7 @@ class tableProperties(UITestCase):
                 belowmf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
                 select_by_text(textdirection, "Left-to-right (LTR)")
             #verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "0")
 
@@ -77,7 +77,7 @@ class tableProperties(UITestCase):
                 self.assertEqual(get_state_as_dict(belowmf)["Text"], "1.00 cm")
 
             #dialog Table Properties - Text flow
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "1")
 
@@ -96,7 +96,7 @@ class tableProperties(UITestCase):
                 vertorient = xDialog.getChild("vertorient")
                 select_by_text(vertorient, "Bottom")
             #verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "1")
 
@@ -116,7 +116,7 @@ class tableProperties(UITestCase):
                 self.assertEqual(get_state_as_dict(vertorient)["SelectEntryText"], "Bottom")
 
             #dialog Table Properties - Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "2")
 
@@ -136,7 +136,7 @@ class tableProperties(UITestCase):
     #        self.ui_test.close_dialog_through_button(xOKBtn)
 
             #dialog Table Properties - Borders
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "3")
 
@@ -146,7 +146,7 @@ class tableProperties(UITestCase):
                 mergeadjacent.executeAction("CLICK", tuple())
 
             #verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "3")
                 sync = xDialog.getChild("sync")
@@ -155,7 +155,7 @@ class tableProperties(UITestCase):
                 self.assertEqual(get_state_as_dict(mergeadjacent)["Selected"], "false")
 
             #dialog Table Properties - Background
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "4")
 
@@ -177,7 +177,7 @@ class tableProperties(UITestCase):
                 B_custom.executeAction("DOWN", tuple())  #need to refresh HEX value...
 
             #verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "4")
                 btncolor = xDialog.getChild("btncolor")
diff --git a/sw/qa/uitest/table/tableToText.py b/sw/qa/uitest/table/tableToText.py
index 944891a4cd01..f5aeb7c500ab 100644
--- a/sw/qa/uitest/table/tableToText.py
+++ b/sw/qa/uitest/table/tableToText.py
@@ -15,7 +15,7 @@ class tableToText(UITestCase):
         with self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) as writer_doc:
             xWriterDoc = self.xUITest.getTopFocusWindow()
             #dialog Table to text - Tabs; verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog:
                 tabs = xDialog.getChild("tabs")
                 tabs.executeAction("CLICK", tuple())
             #verify
@@ -26,7 +26,7 @@ class tableToText(UITestCase):
             self.assertEqual(writer_doc.TextTables.getCount(), 1)
 
             #dialog Table to text - Paragraph; verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog:
                 paragraph = xDialog.getChild("paragraph")
                 paragraph.executeAction("CLICK", tuple())
             #verify
@@ -37,7 +37,7 @@ class tableToText(UITestCase):
             self.assertEqual(writer_doc.TextTables.getCount(), 1)
 
             #dialog Table to text - Semicolons; verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog:
                 semicolons = xDialog.getChild("semicolons")
                 semicolons.executeAction("CLICK", tuple())
             #verify
@@ -48,7 +48,7 @@ class tableToText(UITestCase):
             self.assertEqual(writer_doc.TextTables.getCount(), 1)
 
             #dialog Table to text - other; verify
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog:
                 other = xDialog.getChild("other")
                 other.executeAction("CLICK", tuple())
                 othered = xDialog.getChild("othered")
diff --git a/sw/qa/uitest/table/tdf115026.py b/sw/qa/uitest/table/tdf115026.py
index 761260110060..d6f46aaedb4f 100644
--- a/sw/qa/uitest/table/tdf115026.py
+++ b/sw/qa/uitest/table/tdf115026.py
@@ -18,10 +18,10 @@ class tdf115026(UITestCase):
         self.xUITest.executeCommand(".uno:InsertPagebreak")
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat"):
+        with self.ui_test.execute_dialog_through_command(".uno:AutoFormat"):
             pass
 
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2")
diff --git a/sw/qa/uitest/table/tdf116737.py b/sw/qa/uitest/table/tdf116737.py
index 887083aa8d53..ac77ec5cd2f0 100644
--- a/sw/qa/uitest/table/tdf116737.py
+++ b/sw/qa/uitest/table/tdf116737.py
@@ -18,7 +18,7 @@ class tdf116737(UITestCase):
         document = self.ui_test.get_component()
 
         #Insert => Insert Table / It's not possible to select a table style
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
 
             formatlbinstable = xDialog.getChild("formatlbinstable")
             entry = formatlbinstable.getChild("11") #Simple List Shaded
@@ -26,7 +26,7 @@ class tdf116737(UITestCase):
 
 
         #verify .uno:TableDialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")   #tab Background
 
diff --git a/sw/qa/uitest/table/tdf128593.py b/sw/qa/uitest/table/tdf128593.py
index 3ff5b26d5b54..d7413a5ccc5f 100755
--- a/sw/qa/uitest/table/tdf128593.py
+++ b/sw/qa/uitest/table/tdf128593.py
@@ -12,11 +12,11 @@ class tdf128593(UITestCase):
         MainDoc = self.ui_test.create_doc_in_start_center("writer")
         MainWindow = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         self.xUITest.executeCommandWithParameters(".uno:TableCellBackgroundColor", mkPropertyValues({"TableCellBackgroundColor" : 16776960 }) )
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as TablePropertiesDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as TablePropertiesDialog:
             writer_edit = MainWindow.getChild("writer_edit")
             writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": "0", "START_POS": "0"}))
             tabcontrol = TablePropertiesDialog.getChild("tabcontrol")
diff --git a/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py b/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py
index 494df2017b2d..9b6689808e99 100644
--- a/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py
+++ b/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py
@@ -20,7 +20,7 @@ class tdf134881(UITestCase):
             change_measurement_unit(self, "Centimeter")
 
             #dialog Table Properties
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "2") #columns
 
diff --git a/sw/qa/uitest/table/tdf135693.py b/sw/qa/uitest/table/tdf135693.py
index 6709b0af98b1..db963bcb68fc 100644
--- a/sw/qa/uitest/table/tdf135693.py
+++ b/sw/qa/uitest/table/tdf135693.py
@@ -19,7 +19,7 @@ class tdf135693(UITestCase):
             self.xUITest.executeCommand(".uno:GoDown")
 
             # Without the fix in place, this would have crashed here
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xTableDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xTableDlg:
 
 
                 xTabs = xTableDlg.getChild("tabcontrol")
diff --git a/sw/qa/uitest/table/tdf81292.py b/sw/qa/uitest/table/tdf81292.py
index 26aca3e5ed11..3d884b384d97 100644
--- a/sw/qa/uitest/table/tdf81292.py
+++ b/sw/qa/uitest/table/tdf81292.py
@@ -17,7 +17,7 @@ class tdf81292(UITestCase):
             #select whole table
             self.xUITest.executeCommand(".uno:SelectTable")
             #Tools - Sort
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog:
                 xDown = xDialog.getChild("down1")
                 xDown.executeAction("CLICK", tuple())
             #verify
diff --git a/sw/qa/uitest/table/tdf99334.py b/sw/qa/uitest/table/tdf99334.py
index dfcd2b91db11..b7c53bca5110 100644
--- a/sw/qa/uitest/table/tdf99334.py
+++ b/sw/qa/uitest/table/tdf99334.py
@@ -17,7 +17,7 @@ class tdf99334(UITestCase):
             #select whole table
             self.xUITest.executeCommand(".uno:SelectTable")
             #Tools - Sort
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog"):
+            with self.ui_test.execute_dialog_through_command(".uno:SortDialog"):
                 pass
             #verify
             tables = writer_doc.getTextTables()
diff --git a/sw/qa/uitest/table/textToTable.py b/sw/qa/uitest/table/textToTable.py
index c2a958071c58..63cfbb19f02f 100644
--- a/sw/qa/uitest/table/textToTable.py
+++ b/sw/qa/uitest/table/textToTable.py
@@ -19,7 +19,7 @@ class textToTable(UITestCase):
         #Enter A;B ; select the text ; dialog Text to table - Semicolon; verify
         type_text(xWriterEdit, "A;B;C")
         xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": "0", "END_POS": "5"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTextToTable") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable") as xDialog:
             semicolons = xDialog.getChild("semicolons")
             semicolons.executeAction("CLICK", tuple())
         #verify
@@ -40,7 +40,7 @@ class textToTable(UITestCase):
             xWriterEdit = xWriterDoc.getChild("writer_edit")
             #open file; select all text ; dialog Text to table - other ":"; verify
             self.xUITest.executeCommand(".uno:SelectAll")
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTextToTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable") as xDialog:
                 other = xDialog.getChild("other")
                 other.executeAction("CLICK", tuple())
                 othered = xDialog.getChild("othered")
diff --git a/sw/qa/uitest/ui/fmtui/fmtui.py b/sw/qa/uitest/ui/fmtui/fmtui.py
index 6c575d824757..dc71faa23ec3 100644
--- a/sw/qa/uitest/ui/fmtui/fmtui.py
+++ b/sw/qa/uitest/ui/fmtui/fmtui.py
@@ -18,7 +18,7 @@ class TestTmpdlg(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         xWriterDoc = self.xUITest.getTopFocusWindow()
         document = self.ui_test.get_component()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog:
 
             xTabs = xDialog.getChild("tabcontrol")
             # Select RID_SVXPAGE_CHAR_EFFECTS.
diff --git a/sw/qa/uitest/writer_tests/compareDocuments.py b/sw/qa/uitest/writer_tests/compareDocuments.py
index df0315466694..037b12f309d9 100644
--- a/sw/qa/uitest/writer_tests/compareDocuments.py
+++ b/sw/qa/uitest/writer_tests/compareDocuments.py
@@ -20,7 +20,7 @@ class compareDocuments(UITestCase):
 
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:CompareDocuments", close_button="") as xOpenDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:CompareDocuments", close_button="") as xOpenDialog:
 
                 xFileName = xOpenDialog.getChild("file_name")
                 xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf130960_2.odt")}))
@@ -50,7 +50,7 @@ class compareDocuments(UITestCase):
 
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:CompareDocuments", close_button="") as xOpenDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:CompareDocuments", close_button="") as xOpenDialog:
 
                 xFileName = xOpenDialog.getChild("file_name")
                 xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf137855_2.odt")}))
diff --git a/sw/qa/uitest/writer_tests/insertCaption.py b/sw/qa/uitest/writer_tests/insertCaption.py
index 2bc6e6578ca2..97436a54f73f 100644
--- a/sw/qa/uitest/writer_tests/insertCaption.py
+++ b/sw/qa/uitest/writer_tests/insertCaption.py
@@ -13,7 +13,7 @@ class insertCaption(UITestCase):
    def test_insert_caption(self):
         self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame") as xDialogFr:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFrame") as xDialogFr:
 
             xWidth = xDialogFr.getChild("width")
             xWidth.executeAction("UP", tuple())
@@ -26,7 +26,7 @@ class insertCaption(UITestCase):
 
         self.assertEqual(document.TextFrames.getCount(), 1)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption:
 
             xCapt = xDialogCaption.getChild("caption_edit")
             xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"}))
@@ -36,7 +36,7 @@ class insertCaption(UITestCase):
 
         self.assertEqual(document.TextFrames[0].Text.String.replace('\r\n', '\n'), "\nText 1: Caption")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption:
             xCapt = xDialogCaption.getChild("caption_edit")
             xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption2"}))
             xSep = xDialogCaption.getChild("separator_edit")
@@ -45,7 +45,7 @@ class insertCaption(UITestCase):
 
         self.assertEqual(document.TextFrames[0].Text.String.replace('\r\n', '\n'), "\nText 1: Caption\nText 2-: Caption2")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption:
             xCapt = xDialogCaption.getChild("caption_edit")
             xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption3"}))
             xSep = xDialogCaption.getChild("separator_edit")
diff --git a/sw/qa/uitest/writer_tests/tdf134734.py b/sw/qa/uitest/writer_tests/tdf134734.py
index 178a25adc080..0bd8f1678612 100644
--- a/sw/qa/uitest/writer_tests/tdf134734.py
+++ b/sw/qa/uitest/writer_tests/tdf134734.py
@@ -17,7 +17,7 @@ class TestClass(UITestCase):
         document = self.ui_test.get_component()
 
         # set margins and fill color
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
@@ -49,7 +49,7 @@ class TestClass(UITestCase):
         self.assertEqual(xStyle.BackgroundFullSize, True)
 
         # uncheck it
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
@@ -64,7 +64,7 @@ class TestClass(UITestCase):
         self.assertEqual(xStyle.BackgroundFullSize, False)
 
         # check it again
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog:
             xTabs = DrawPageDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize")
diff --git a/sw/qa/uitest/writer_tests/tdf53460.py b/sw/qa/uitest/writer_tests/tdf53460.py
index 1688f155dcb6..5c3fda7b6371 100644
--- a/sw/qa/uitest/writer_tests/tdf53460.py
+++ b/sw/qa/uitest/writer_tests/tdf53460.py
@@ -17,12 +17,12 @@ class tdf53460(UITestCase):
         xWriterEdit = xWriterDoc.getChild("writer_edit")
         document = self.ui_test.get_component()
         #-insert a table (by default 2x2)
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         #-put the cursor inside first cell top left for example
         #-insert an inner table (by default 2x2) inside this cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         #-still in top left cell, go to the line after the inner table
diff --git a/sw/qa/uitest/writer_tests/tdf78068.py b/sw/qa/uitest/writer_tests/tdf78068.py
index f8944196402d..46497f621028 100644
--- a/sw/qa/uitest/writer_tests/tdf78068.py
+++ b/sw/qa/uitest/writer_tests/tdf78068.py
@@ -19,7 +19,7 @@ class tdf78068(UITestCase):
         #- add some text
         type_text(xWriterEdit, "Test")
         #- go to Format > Paragraph
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
 
diff --git a/sw/qa/uitest/writer_tests/tdf81457.py b/sw/qa/uitest/writer_tests/tdf81457.py
index 496479e33f66..52db731e8723 100644
--- a/sw/qa/uitest/writer_tests/tdf81457.py
+++ b/sw/qa/uitest/writer_tests/tdf81457.py
@@ -16,7 +16,7 @@ class tdf81457(UITestCase):
 #tdf 81457
    def test_open_documentProperties_tdf81457(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf81457.odt")) as writer_doc:
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "2")     #tab Custom properties
 
diff --git a/sw/qa/uitest/writer_tests/tdf93068.py b/sw/qa/uitest/writer_tests/tdf93068.py
index 2d0177a4f328..2d2830cb1c81 100644
--- a/sw/qa/uitest/writer_tests/tdf93068.py
+++ b/sw/qa/uitest/writer_tests/tdf93068.py
@@ -18,7 +18,7 @@ class tdf93068(UITestCase):
 
         # tdf#135950: Character dialog crashes if multiple cells in a
         # table are selected
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         self.xUITest.executeCommand(".uno:SelectAll")
@@ -26,13 +26,13 @@ class tdf93068(UITestCase):
         # Check the table is selected
         self.assertEqual("SwXTextTableCursor", document.CurrentSelection.getImplementationName())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xFontDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xFontDlg:
             xDiscardBtn = xFontDlg.getChild("reset")
             xDiscardBtn.executeAction("CLICK", tuple())
 
diff --git a/sw/qa/uitest/writer_tests/versionDialog.py b/sw/qa/uitest/writer_tests/versionDialog.py
index e5a1f1fa0ab5..391558c0095d 100644
--- a/sw/qa/uitest/writer_tests/versionDialog.py
+++ b/sw/qa/uitest/writer_tests/versionDialog.py
@@ -18,7 +18,7 @@ class versionDialog(UITestCase):
 
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:VersionDialog", close_button="close") as xVersionDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:VersionDialog", close_button="close") as xVersionDialog:
 
 
                 versiondList = xVersionDialog.getChild("versions")
diff --git a/sw/qa/uitest/writer_tests/watermark.py b/sw/qa/uitest/writer_tests/watermark.py
index 3802ce17f478..3e701c271e49 100644
--- a/sw/qa/uitest/writer_tests/watermark.py
+++ b/sw/qa/uitest/writer_tests/watermark.py
@@ -16,7 +16,7 @@ class watermark(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Watermark") as xDialog:
             xTextInput = xDialog.getChild("TextInput")
             xAngle = xDialog.getChild("Angle")
             xTransparency = xDialog.getChild("Transparency")
@@ -26,7 +26,7 @@ class watermark(UITestCase):
             xTransparency.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog:
             xTextInput = xDialog.getChild("TextInput")
             xAngle = xDialog.getChild("Angle")
             xTransparency = xDialog.getChild("Transparency")
@@ -36,12 +36,12 @@ class watermark(UITestCase):
             self.assertEqual(get_state_as_dict(xTransparency)["Text"], "51%")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Watermark") as xDialog:
             xTextInput = xDialog.getChild("TextInput")
             xTextInput.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xTextInput.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog:
             xTextInput = xDialog.getChild("TextInput")
 
             self.assertEqual(get_state_as_dict(xTextInput)["Text"], "")
diff --git a/sw/qa/uitest/writer_tests2/bookmark.py b/sw/qa/uitest/writer_tests2/bookmark.py
index 69f395af4c87..acd2bac7747c 100644
--- a/sw/qa/uitest/writer_tests2/bookmark.py
+++ b/sw/qa/uitest/writer_tests2/bookmark.py
@@ -17,29 +17,29 @@ class bookmarkDialog(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert") as xBookDlg:
             xBmk = xBookDlg.getChild("bookmarks")
             self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "1")  #check for 1st bookmark exist
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg:
             xBmk = xBookDlg.getChild("bookmarks")
             self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "2")   #check for 2 bookmarks
 
 #now delete one bookmark
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg:
             xBmk = xBookDlg.getChild("bookmarks")
             xSecondListEntry = xBmk.getChild("1") #  select second bookmark
             xSecondListEntry.executeAction("SELECT", tuple())
             xDelBtn = xBookDlg.getChild("delete")
             xDelBtn.executeAction("CLICK", tuple())    # delete one bookmark
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg:
             xBmk2 = xBookDlg.getChild("bookmarks")
             self.assertEqual(get_state_as_dict(xBmk2)["VisibleCount"], "1")  #check for 1 bookmark
 
@@ -48,10 +48,10 @@ class bookmarkDialog(UITestCase):
     def test_bookmark_dialog_rename(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg:
             xBmk = xBookDlg.getChild("bookmarks")
             xFirstListEntry = xBmk.getChild("0") #  select first bookmark
             xFirstListEntry.executeAction("SELECT", tuple())
@@ -74,7 +74,7 @@ class bookmarkDialog(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"):
             pass
 
         type_text(xWriterEdit, "Test for bookmark")
@@ -82,10 +82,10 @@ class bookmarkDialog(UITestCase):
         xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
         type_text(xWriterEdit, "Test2 for bookmark")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"):
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg:
             xBmk = xBookDlg.getChild("bookmarks")
             xFirstListEntry = xBmk.getChild("0") #  select first bookmark
             xFirstListEntry.executeAction("SELECT", tuple())
diff --git a/sw/qa/uitest/writer_tests2/documentProperties.py b/sw/qa/uitest/writer_tests2/documentProperties.py
index 0f534276013e..384dc1e1ef62 100644
--- a/sw/qa/uitest/writer_tests2/documentProperties.py
+++ b/sw/qa/uitest/writer_tests2/documentProperties.py
@@ -30,7 +30,7 @@ class documentProperties(UITestCase):
 
    def test_open_documentProperties_writer(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog:
             xResetBtn = xDialog.getChild("reset")
             xResetBtn.executeAction("CLICK", tuple())
 
@@ -96,7 +96,7 @@ class documentProperties(UITestCase):
             xUpdateBtn.executeAction("CLICK", tuple())
 
 #now open the dialog again and read the properties
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties", close_button="cancel") as xDialog:
             xTitleText = xDialog.getChild("title")
             xSubjectText = xDialog.getChild("subject")
             xKeywordsText = xDialog.getChild("keywords")
diff --git a/sw/qa/uitest/writer_tests2/exchangeDatabase.py b/sw/qa/uitest/writer_tests2/exchangeDatabase.py
index bba8a8bc1aee..1cf43237c3b8 100644
--- a/sw/qa/uitest/writer_tests2/exchangeDatabase.py
+++ b/sw/qa/uitest/writer_tests2/exchangeDatabase.py
@@ -14,7 +14,7 @@ class exchangeDB(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField", close_button="close"):
+        with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField", close_button="close"):
             pass
 
         self.ui_test.close_doc()
@@ -23,7 +23,7 @@ class exchangeDB(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField") as xExDBDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField") as xExDBDlg:
             xTreelist = xExDBDlg.getChild("availablelb")
 
             xLabeldb = xExDBDlg.getChild("dbnameft")
@@ -36,7 +36,7 @@ class exchangeDB(UITestCase):
             xTreeEntry2 = xTreeEntry.getChild('0')                 #Available Databases
             xTreeEntry2.executeAction("SELECT", tuple())          #Click on the biblio
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField", close_button="close") as xExDBDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField", close_button="close") as xExDBDlg:
             xLabeldb = xExDBDlg.getChild("dbnameft")
             self.assertEqual(get_state_as_dict(xLabeldb)["Text"], "Bibliography.biblio")
 
diff --git a/sw/qa/uitest/writer_tests2/fontworks.py b/sw/qa/uitest/writer_tests2/fontworks.py
index 489bf3a120a8..b9ab330dfda0 100644
--- a/sw/qa/uitest/writer_tests2/fontworks.py
+++ b/sw/qa/uitest/writer_tests2/fontworks.py
@@ -19,7 +19,7 @@ class fontWorksDialog(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontworkGalleryFloater", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontworkGalleryFloater", close_button="cancel") as xDialog:
             FontWorkSelector = xDialog.getChild("ctlFavoriteswin")
             # Select element with id (3)
             element3 = FontWorkSelector.getChild("2")
diff --git a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
index 93a67bd8152e..0d0f7dcf1b9f 100644
--- a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
+++ b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
@@ -21,7 +21,7 @@ class formatBulletsNumbering(UITestCase):
 
         change_measurement_unit(self, "Millimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xalignedatmf = xDialog.getChild("alignedatmf")
@@ -35,7 +35,7 @@ class formatBulletsNumbering(UITestCase):
             xindentatmf.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xalignedatmf = xDialog.getChild("alignedatmf")
@@ -56,14 +56,14 @@ class formatBulletsNumbering(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xnumfollowedbylb = xDialog.getChild("numfollowedbylb")
             select_by_text(xnumfollowedbylb, "Space")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xnumfollowedbylb = xDialog.getChild("numfollowedbylb")
@@ -77,7 +77,7 @@ class formatBulletsNumbering(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
             xnumfmtlb = xDialog.getChild("numfmtlb")
@@ -96,7 +96,7 @@ class formatBulletsNumbering(UITestCase):
             xallsame.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
             xnumfmtlb = xDialog.getChild("numfmtlb")
@@ -114,10 +114,10 @@ class formatBulletsNumbering(UITestCase):
             self.assertEqual(get_state_as_dict(xallsame)["Selected"], "true")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="user") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="user") as xDialog:
             pass
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
             xnumfmtlb = xDialog.getChild("numfmtlb")
@@ -145,7 +145,7 @@ class formatBulletsNumbering(UITestCase):
 
         change_measurement_unit(self, "Millimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -153,7 +153,7 @@ class formatBulletsNumbering(UITestCase):
 
 
         xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) #TAB to move indent right
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -161,7 +161,7 @@ class formatBulletsNumbering(UITestCase):
             self.assertEqual(indentValue < indentValue2 , True)
 
         xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "BACKSPACE"}))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -177,7 +177,7 @@ class formatBulletsNumbering(UITestCase):
 
         change_measurement_unit(self, "Millimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -185,7 +185,7 @@ class formatBulletsNumbering(UITestCase):
 
 
         self.xUITest.executeCommand(".uno:DecrementSubLevels")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -193,7 +193,7 @@ class formatBulletsNumbering(UITestCase):
             self.assertEqual(indentValue < indentValue2 , True)
 
         self.xUITest.executeCommand(".uno:IncrementLevel")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xindentatmf = xDialog.getChild("indentatmf")
@@ -208,7 +208,7 @@ class formatBulletsNumbering(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
         # Test Bullet Page
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
 
             # Select the BulletPage's Selector
             xTabs = xDialog.getChild("tabcontrol")
@@ -229,7 +229,7 @@ class formatBulletsNumbering(UITestCase):
 
 
         # Test other Pages
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog:
             # Select the NumberingPage's Selector
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py
index 00660cc233b5..e6829b7f8c84 100644
--- a/sw/qa/uitest/writer_tests2/formatCharacter.py
+++ b/sw/qa/uitest/writer_tests2/formatCharacter.py
@@ -18,7 +18,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
 
@@ -39,7 +39,7 @@ class formatCharacter(UITestCase):
             select_pos(xLangFontEast, "0")
             select_pos(xLangFontCTL, "0")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xSizeFont = xDialog.getChild("westsizelb-cjk")
             xSizeFontEast = xDialog.getChild("eastsizelb")
             xSizeFontCTL = xDialog.getChild("ctlsizelb")
@@ -62,7 +62,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
@@ -85,7 +85,7 @@ class formatCharacter(UITestCase):
             select_pos(xPosition, "1")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
@@ -115,7 +115,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
 
@@ -135,7 +135,7 @@ class formatCharacter(UITestCase):
         self.xUITest.executeCommand(".uno:GoLeft")
         self.assertEqual(document.Text.String[0:11], "LibreOffice")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
             xURL = xDialog.getChild("urled")
@@ -157,7 +157,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")
 
@@ -165,7 +165,7 @@ class formatCharacter(UITestCase):
             xTwolines.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")
             xTwolines = xDialog.getChild("twolines")
@@ -178,7 +178,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -199,7 +199,7 @@ class formatCharacter(UITestCase):
             xFitToLine.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
             xSuperscript = xDialog.getChild("superscript")
@@ -225,7 +225,7 @@ class formatCharacter(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -233,7 +233,7 @@ class formatCharacter(UITestCase):
             xScalewidth.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
             xScalewidth = xDialog.getChild("scalewidthsb")
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py
index a46864544744..ffd583e937af 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -19,7 +19,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
 
@@ -44,7 +44,7 @@ class formatParagraph(UITestCase):
             xActivate.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xBeforeText = xDialog.getChild("spinED_LEFTINDENT")
@@ -75,7 +75,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
@@ -94,7 +94,7 @@ class formatParagraph(UITestCase):
             xExpandChk.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
@@ -120,7 +120,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -153,7 +153,7 @@ class formatParagraph(UITestCase):
             xcheckKeepPara.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
 
@@ -193,7 +193,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")
 
@@ -206,7 +206,7 @@ class formatParagraph(UITestCase):
             xcheckApplySpacing.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "3")
 
@@ -226,7 +226,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
 
@@ -241,7 +241,7 @@ class formatParagraph(UITestCase):
             xParaSpin.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "4")
 
@@ -265,7 +265,7 @@ class formatParagraph(UITestCase):
 
         change_measurement_unit(self, "Centimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -287,7 +287,7 @@ class formatParagraph(UITestCase):
             xNewButtn.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -305,7 +305,7 @@ class formatParagraph(UITestCase):
             self.assertEqual(get_state_as_dict(xED_TABPOS)["Text"], "1.00 cm")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -317,7 +317,7 @@ class formatParagraph(UITestCase):
             xUnderscore.executeAction("CLICK", tuple())
             xNewButtn.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -327,7 +327,7 @@ class formatParagraph(UITestCase):
             self.assertEqual(get_state_as_dict(xUnderscore)["Checked"], "true")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -339,7 +339,7 @@ class formatParagraph(UITestCase):
             xDashLine.executeAction("CLICK", tuple())
             xNewButtn.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -349,7 +349,7 @@ class formatParagraph(UITestCase):
             self.assertEqual(get_state_as_dict(xDashLine)["Checked"], "true")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -361,7 +361,7 @@ class formatParagraph(UITestCase):
             xPointsLine.executeAction("CLICK", tuple())
             xNewButtn.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "5")
 
@@ -378,7 +378,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")
 
@@ -396,7 +396,7 @@ class formatParagraph(UITestCase):
             xText.executeAction("TYPE", mkPropertyValues({"TEXT":"A"}))
             select_by_text(xCharStyle, "Definition")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "6")
 
@@ -422,7 +422,7 @@ class formatParagraph(UITestCase):
 
         change_measurement_unit(self, "Centimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "7")
 
@@ -445,7 +445,7 @@ class formatParagraph(UITestCase):
             xMerge.executeAction("CLICK", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "7")
 
@@ -472,7 +472,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "8")
 
@@ -494,7 +494,7 @@ class formatParagraph(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "9")
 
@@ -505,7 +505,7 @@ class formatParagraph(UITestCase):
             xTranText.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "9")
 
@@ -516,7 +516,7 @@ class formatParagraph(UITestCase):
             self.assertEqual(get_state_as_dict(xTranText)["Text"], "51%")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "9")
 
@@ -535,7 +535,7 @@ class formatParagraph(UITestCase):
             xEnd.executeAction("UP", tuple())
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "9")
 
diff --git a/sw/qa/uitest/writer_tests2/horizontalLine.py b/sw/qa/uitest/writer_tests2/horizontalLine.py
index dddaada8bdea..641210c2dff0 100644
--- a/sw/qa/uitest/writer_tests2/horizontalLine.py
+++ b/sw/qa/uitest/writer_tests2/horizontalLine.py
@@ -19,14 +19,14 @@ class WriterInsertHorizontalLine(UITestCase):
 
         self.xUITest.executeCommand(".uno:StyleApply?Style:string=Horizontal%20Line&FamilyName:string=ParagraphStyles") #insert horizontal line
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog:
             xStyleNametxt = xDialog.getChild("name")
             self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line") #check style name
 
         self.xUITest.executeCommand(".uno:Undo")
         self.xUITest.executeCommand(".uno:Redo")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog:
             xStyleNametxt = xDialog.getChild("name")
             self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line")  #check style name
 
diff --git a/sw/qa/uitest/writer_tests2/pasteSpecial.py b/sw/qa/uitest/writer_tests2/pasteSpecial.py
index ae1ee10be4c6..b080d7f86ab8 100644
--- a/sw/qa/uitest/writer_tests2/pasteSpecial.py
+++ b/sw/qa/uitest/writer_tests2/pasteSpecial.py
@@ -21,7 +21,7 @@ class PasteSpecial(UITestCase):
             self.xUITest.executeCommand(".uno:SelectAll")
             self.xUITest.executeCommand(".uno:Copy")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog:
 
                 xList = xDialog.getChild('list')
                 xChild = xList.getChild(str(i))
diff --git a/sw/qa/uitest/writer_tests2/tdf116474.py b/sw/qa/uitest/writer_tests2/tdf116474.py
index 8f6fc8951a6b..c56c8c1052e0 100644
--- a/sw/qa/uitest/writer_tests2/tdf116474.py
+++ b/sw/qa/uitest/writer_tests2/tdf116474.py
@@ -24,7 +24,7 @@ class tdf116474(UITestCase):
         #select image
         document.getCurrentController().select(document.getDrawPage()[0])
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption:
 
             xCapt = xDialogCaption.getChild("caption_edit")
             xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"}))
diff --git a/sw/qa/uitest/writer_tests3/autoredactDialog.py b/sw/qa/uitest/writer_tests3/autoredactDialog.py
index 2ea73bccfc47..fb306b32c54b 100644
--- a/sw/qa/uitest/writer_tests3/autoredactDialog.py
+++ b/sw/qa/uitest/writer_tests3/autoredactDialog.py
@@ -39,7 +39,7 @@ class AutoRedactDialog(UITestCase):
 
     def test_add_target(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
             xAddBtn = xDialog.getChild("add")
 
             # Make sure we are starting with an empty targets list
@@ -79,7 +79,7 @@ class AutoRedactDialog(UITestCase):
                 self.assertEqual(child_text[2], targets_list[i][1]) #content
 
         # Now let's make sure the dialog remembers last state
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
             xTargetsListbox = xDialog.getChild("targets")
             targets_box_state_dict = get_state_as_dict(xTargetsListbox)
             self.assertEqual(int(targets_box_state_dict["Children"]), len(targets_list))
@@ -96,7 +96,7 @@ class AutoRedactDialog(UITestCase):
 
     def test_edit_target(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog:
             xAddBtn = xDialog.getChild("add")
             xEditBtn = xDialog.getChild("edit")
 
diff --git a/sw/qa/uitest/writer_tests3/customizeDialog.py b/sw/qa/uitest/writer_tests3/customizeDialog.py
index 3e9a9cbf9fd7..187ff67a3f59 100644
--- a/sw/qa/uitest/writer_tests3/customizeDialog.py
+++ b/sw/qa/uitest/writer_tests3/customizeDialog.py
@@ -16,14 +16,14 @@ class ConfigureDialog(UITestCase):
     def test_open_ConfigureDialog_writer(self):
 
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel"):
             pass
 
         self.ui_test.close_doc()
 
     def test_search_filter(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog:
 
             xfunc = xDialog.getChild("functions")
             xSearch = xDialog.getChild("searchEntry")
@@ -61,7 +61,7 @@ class ConfigureDialog(UITestCase):
 
     def test_category_listbox(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog:
 
             xFunc = xDialog.getChild("functions")
             xCategory = xDialog.getChild("commandcategorylist")
@@ -87,7 +87,7 @@ class ConfigureDialog(UITestCase):
 
         # Without the fix in place, calling customize dialog after inserting
         # a formula object would crash
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel"):
             pass
 
         self.ui_test.close_doc()
@@ -95,7 +95,7 @@ class ConfigureDialog(UITestCase):
     def test_gear_button_menu(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog:
 
             # Open the New Menu Dialog with id = 0
             xmenugearbtn=xDialog.getChild("menugearbtn")
diff --git a/sw/qa/uitest/writer_tests3/goToPage.py b/sw/qa/uitest/writer_tests3/goToPage.py
index 3a6220fa2a27..1d35966ebb84 100644
--- a/sw/qa/uitest/writer_tests3/goToPage.py
+++ b/sw/qa/uitest/writer_tests3/goToPage.py
@@ -14,20 +14,20 @@ class GoToPage_dialog(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog:
             xPageText = xDialog.getChild("page")
             xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"2"}))
 
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog:
             xPageText = xDialog.getChild("page")
             xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"3a"}))
 
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3")
 
         # check cancel button
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:GotoPage", close_button="cancel"):
             pass
 
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3")
diff --git a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
index 890cb10fb7cf..82c4d9d92817 100644
--- a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
+++ b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
@@ -21,7 +21,7 @@ class HyperlinkDialog(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         MainWindow = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog", close_button="cancel") as xDialog:
 
             # Test the vertical tab
             xtab=xDialog.getChild("tabcontrol")
@@ -51,7 +51,7 @@ class HyperlinkDialog(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         xMainWindow = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog") as xDialog:
 
             # insert link
             xtab=xDialog.getChild("tabcontrol")
@@ -93,7 +93,7 @@ class HyperlinkDialog(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog", close_button="") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog", close_button="") as xDialog:
             xHelp = xDialog.getChild("help")
             xHelp.executeAction('FOCUS', tuple())
 
diff --git a/sw/qa/uitest/writer_tests3/insertEnvelope.py b/sw/qa/uitest/writer_tests3/insertEnvelope.py
index a0cf97cd22f9..2de03efa94e4 100644
--- a/sw/qa/uitest/writer_tests3/insertEnvelope.py
+++ b/sw/qa/uitest/writer_tests3/insertEnvelope.py
@@ -16,7 +16,7 @@ class WriterInsertEnvelope(UITestCase):
     def test_insert_envelope(self):
         self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope", close_button="user") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope", close_button="user") as xDialog:
             xAddrTxt= xDialog.getChild("addredit")
             xSenderTxt = xDialog.getChild("senderedit")
             xSenderCheckBox = xDialog.getChild("sender")
@@ -29,7 +29,7 @@ class WriterInsertEnvelope(UITestCase):
             xSenderTxt.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
             xSenderTxt.executeAction("TYPE", mkPropertyValues({"TEXT":"Sender"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope", close_button="cancel") as xDialog:
             xAddrTxt= xDialog.getChild("addredit")
             xSenderTxt = xDialog.getChild("senderedit")
             self.assertEqual(get_state_as_dict(xAddrTxt)["Text"], "Address")
diff --git a/sw/qa/uitest/writer_tests3/insertFootEndnote.py b/sw/qa/uitest/writer_tests3/insertFootEndnote.py
index c5e3c8078870..88570af7c0e1 100644
--- a/sw/qa/uitest/writer_tests3/insertFootEndnote.py
+++ b/sw/qa/uitest/writer_tests3/insertFootEndnote.py
@@ -15,14 +15,14 @@ class insertFootEndnote(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
 #Automatic - Footnote
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog"):
             pass
 
         self.assertEqual(document.Footnotes.getCount(), 1)
         self.xUITest.executeCommand(".uno:Undo")
         self.assertEqual(document.Footnotes.getCount(), 0)
 #Automatic - Endnote
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog:
             xEndnote = xDialog.getChild("endnote")
             xEndnote.executeAction("CLICK", tuple())
 
@@ -30,7 +30,7 @@ class insertFootEndnote(UITestCase):
         self.xUITest.executeCommand(".uno:Undo")
         self.assertEqual(document.Endnotes.getCount(), 0)
 #Character - Footnote
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog:
             xChar = xDialog.getChild("character")
             xChar.executeAction("CLICK", tuple())
             xCharentry = xDialog.getChild("characterentry")
@@ -41,7 +41,7 @@ class insertFootEndnote(UITestCase):
         self.assertEqual(document.Footnotes.getCount(), 0)
 
 #Character - Endnote
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog:
             xChar = xDialog.getChild("character")
             xChar.executeAction("CLICK", tuple())
             xCharentry = xDialog.getChild("characterentry")
@@ -55,7 +55,7 @@ class insertFootEndnote(UITestCase):
         self.assertEqual(document.Endnotes.getCount(), 0)
 
 #Cancel button
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog", close_button="cancel"):
             pass
 
         self.ui_test.close_doc()
diff --git a/sw/qa/uitest/writer_tests3/insertPageFooter.py b/sw/qa/uitest/writer_tests3/insertPageFooter.py
index 034952077d17..a471268a054c 100644
--- a/sw/qa/uitest/writer_tests3/insertPageFooter.py
+++ b/sw/qa/uitest/writer_tests3/insertPageFooter.py
@@ -27,7 +27,7 @@ class WriterInsertPageFooter(UITestCase):
         self.assertEqual(
             document.StyleFamilies.PageStyles.Standard.FooterIsOn, True)
 
-        with self.ui_test.execute_dialog_through_command_guarded(
+        with self.ui_test.execute_dialog_through_command(
                 ".uno:InsertPageFooter?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"):
             pass
 
@@ -48,7 +48,7 @@ class WriterInsertPageFooter(UITestCase):
 
         self.insert_footer()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         document = self.ui_test.get_component()
diff --git a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
index be74dc6d2355..6fe58c90a47e 100644
--- a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
+++ b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
@@ -16,7 +16,7 @@ class insertQrCode(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
         # cancel the dialog without doing anything
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode", close_button="cancel") as xDialog:
 
             xURL = xDialog.getChild("edit_text")
             type_text(xURL, "www.libreoffice.org")
@@ -25,7 +25,7 @@ class insertQrCode(UITestCase):
             document.DrawPage.getByIndex(0)
 
         # Reopen the dialog box
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog:
 
             # Get elements in the Dialog Box
             xURL = xDialog.getChild("edit_text")
@@ -49,7 +49,7 @@ class insertQrCode(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog:
 
             xURL = xDialog.getChild("edit_text")
             xECC_Low = xDialog.getChild("button_low")
diff --git a/sw/qa/uitest/writer_tests3/insertSignatureLine.py b/sw/qa/uitest/writer_tests3/insertSignatureLine.py
index 7c44f2253d39..f1aa3146fb73 100644
--- a/sw/qa/uitest/writer_tests3/insertSignatureLine.py
+++ b/sw/qa/uitest/writer_tests3/insertSignatureLine.py
@@ -16,7 +16,7 @@ class insertSignatureLine(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
         # cancel the dialog without doing anything
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine", close_button="cancel") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
@@ -25,7 +25,7 @@ class insertSignatureLine(UITestCase):
             document.DrawPage.getByIndex(0)
 
         # set the signature line
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xTitle = xDialog.getChild("edit_title")
@@ -56,7 +56,7 @@ class insertSignatureLine(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog:
 
             xName = xDialog.getChild("edit_name")
             xTitle = xDialog.getChild("edit_title")
diff --git a/sw/qa/uitest/writer_tests3/lineNumbering.py b/sw/qa/uitest/writer_tests3/lineNumbering.py
index 20e77a30db7c..374e40c1f57f 100644
--- a/sw/qa/uitest/writer_tests3/lineNumbering.py
+++ b/sw/qa/uitest/writer_tests3/lineNumbering.py
@@ -19,7 +19,7 @@ class WriterLineNumbering(UITestCase):
 
         change_measurement_unit(self, "Centimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog") as xDialog:
             xshownumbering = xDialog.getChild("shownumbering")
             xstyledropdown = xDialog.getChild("styledropdown")
             xformatdropdown = xDialog.getChild("formatdropdown")
@@ -46,7 +46,7 @@ class WriterLineNumbering(UITestCase):
             xshowfooterheadernumbering.executeAction("CLICK", tuple())
             xrestarteverynewpage.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog", close_button="cancel") as xDialog:
             xshownumbering = xDialog.getChild("shownumbering")
             xstyledropdown = xDialog.getChild("styledropdown")
             xformatdropdown = xDialog.getChild("formatdropdown")
@@ -78,7 +78,7 @@ class WriterLineNumbering(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog", close_button="cancel") as xDialog:
             xshownumbering = xDialog.getChild("shownumbering")
             xformatdropdown = xDialog.getChild("formatdropdown")
 
diff --git a/sw/qa/uitest/writer_tests3/pageDialog.py b/sw/qa/uitest/writer_tests3/pageDialog.py
index 196876ed1e01..b509a106b2a1 100644
--- a/sw/qa/uitest/writer_tests3/pageDialog.py
+++ b/sw/qa/uitest/writer_tests3/pageDialog.py
@@ -118,14 +118,14 @@ class WriterPageDialog(UITestCase):
         buttons = ['btnbitmap', 'btncolor', 'btngradient', 'btnhatch', 'btnpattern']
         for index, button in enumerate(buttons):
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "2")
                 self.click_button(xDialog, button)
 
             self.check_default_area(button)
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "2")
 
@@ -147,7 +147,7 @@ class WriterPageDialog(UITestCase):
 
         for i in range(30):
             with self.subTest(i=i):
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
                     tabcontrol = xDialog.getChild("tabcontrol")
                     select_pos(tabcontrol, "1")
                     xFormatList = xDialog.getChild("comboPageFormat")
@@ -167,7 +167,7 @@ class WriterPageDialog(UITestCase):
         self.assertEqual(
             document.StyleFamilies.PageStyles.Standard.IsLandscape, False)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
             self.click_button(xDialog, 'radiobuttonLandscape')
@@ -175,7 +175,7 @@ class WriterPageDialog(UITestCase):
         self.assertEqual(
             document.StyleFamilies.PageStyles.Standard.IsLandscape, True)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, "1")
             self.click_button(xDialog, 'radiobuttonPortrait')
@@ -196,7 +196,7 @@ class WriterPageDialog(UITestCase):
 
         for i in range(4):
             with self.subTest(i=i):
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
                     tabcontrol = xDialog.getChild("tabcontrol")
                     select_pos(tabcontrol, "1")
 
@@ -214,7 +214,7 @@ class WriterPageDialog(UITestCase):
     def test_cancel_button_page_dialog(self):
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog:
             pass
 
         self.ui_test.close_doc()
diff --git a/sw/qa/uitest/writer_tests3/sort.py b/sw/qa/uitest/writer_tests3/sort.py
index 948f8bbe0b99..5bd2f70d4df6 100644
--- a/sw/qa/uitest/writer_tests3/sort.py
+++ b/sw/qa/uitest/writer_tests3/sort.py
@@ -25,7 +25,7 @@ class WriterSort(UITestCase):
 
         selection = self.xUITest.executeCommand(".uno:SelectAll")  #select whole text
         #Tools - Sort
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog:
             xDown = xDialog.getChild("down1")
             xDown.executeAction("CLICK", tuple())
         #check
@@ -45,7 +45,7 @@ class WriterSort(UITestCase):
 
         selection = self.xUITest.executeCommand(".uno:SelectAll")  #select whole text
         #Tools - Sort
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog:
             xDown = xDialog.getChild("down1")
             xcolsb1 = xDialog.getChild("colsb1")
             xtypelb1 = xDialog.getChild("typelb1")
diff --git a/sw/qa/uitest/writer_tests3/specialCharacter.py b/sw/qa/uitest/writer_tests3/specialCharacter.py
index 420a9c3fb630..d0617bc8baea 100644
--- a/sw/qa/uitest/writer_tests3/specialCharacter.py
+++ b/sw/qa/uitest/writer_tests3/specialCharacter.py
@@ -21,7 +21,7 @@ class specialCharacter(UITestCase):
 
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSymbol", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSymbol", close_button="cancel") as xDialog:
             xCharSet = xDialog.getChild("showcharset")  # default charset
 
             xCharSet.executeAction("SELECT", mkPropertyValues({"COLUMN": "1", "ROW": "4"}))  # digit 4 selected
@@ -33,7 +33,7 @@ class specialCharacter(UITestCase):
             self.assertEqual(get_state_as_dict(xDecText)["Text"], "52")
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSymbol", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSymbol", close_button="cancel") as xDialog:
 
             xComboFont = xDialog.getChild("fontlb")
             select_pos(xComboFont, "0")  # select font
diff --git a/sw/qa/uitest/writer_tests3/tdf79236.py b/sw/qa/uitest/writer_tests3/tdf79236.py
index 1f9089d11499..9f23d035da77 100644
--- a/sw/qa/uitest/writer_tests3/tdf79236.py
+++ b/sw/qa/uitest/writer_tests3/tdf79236.py
@@ -30,7 +30,7 @@ class tdf79236(UITestCase):
 
         self.assertEqual(document.CurrentSelection.getByIndex(0).String, "Test for tdf79236")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xParagraphDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xParagraphDlg:
 
 
 
@@ -63,7 +63,7 @@ class tdf79236(UITestCase):
         self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 5503)
         self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 3704)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xParagraphDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xParagraphDlg:
 
 
             xLeftSpnBtn = xParagraphDlg.getChild("spinED_LEFTINDENT")
diff --git a/sw/qa/uitest/writer_tests4/insertBreakDialog.py b/sw/qa/uitest/writer_tests4/insertBreakDialog.py
index f0c4101501f8..3af079774dc4 100644
--- a/sw/qa/uitest/writer_tests4/insertBreakDialog.py
+++ b/sw/qa/uitest/writer_tests4/insertBreakDialog.py
@@ -18,7 +18,7 @@ class WriterInsertBreakDialog(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog:
             xOption = xDialog.getChild("linerb")
             xOption.executeAction("CLICK", tuple())
 
@@ -30,7 +30,7 @@ class WriterInsertBreakDialog(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog:
             xOption = xDialog.getChild("columnrb")
             xOption.executeAction("CLICK", tuple())
 
@@ -44,7 +44,7 @@ class WriterInsertBreakDialog(UITestCase):
 
         for i in range(9):
             with self.subTest(i=i):
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog:
 
                     xOption = xDialog.getChild("pagerb")
                     xOption.executeAction("CLICK", tuple())
@@ -60,7 +60,7 @@ class WriterInsertBreakDialog(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertBreak", close_button="cancel"):
             pass
 
         self.getPages(1)
diff --git a/sw/qa/uitest/writer_tests4/insertPageHeader.py b/sw/qa/uitest/writer_tests4/insertPageHeader.py
index 42c2df3d84fc..ebe94b145f8c 100644
--- a/sw/qa/uitest/writer_tests4/insertPageHeader.py
+++ b/sw/qa/uitest/writer_tests4/insertPageHeader.py
@@ -26,7 +26,7 @@ class WriterInsertPageHeader(UITestCase):
         self.assertEqual(
             document.StyleFamilies.PageStyles.Standard.HeaderIsOn, True)
 
-        with self.ui_test.execute_dialog_through_command_guarded(
+        with self.ui_test.execute_dialog_through_command(
                 ".uno:InsertPageHeader?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"):
             pass
 
@@ -47,7 +47,7 @@ class WriterInsertPageHeader(UITestCase):
 
         self.insert_header()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
 
         document = self.ui_test.get_component()
diff --git a/sw/qa/uitest/writer_tests4/tdf113252.py b/sw/qa/uitest/writer_tests4/tdf113252.py
index 69ebc0b0b34d..8bcd3736ffec 100644
--- a/sw/qa/uitest/writer_tests4/tdf113252.py
+++ b/sw/qa/uitest/writer_tests4/tdf113252.py
@@ -18,7 +18,7 @@ class tdf113252(UITestCase):
         xWriterEdit = xWriterDoc.getChild("writer_edit")
 
         #Start LibreOffice. Go to Tools > Macros > Organize Macros > Basic
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="close") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="close") as xDialog:
 
             #Click Button Organizer
             xorganize = xDialog.getChild("organize")
diff --git a/sw/qa/uitest/writer_tests4/tdf113284.py b/sw/qa/uitest/writer_tests4/tdf113284.py
index 2bd253f1ec8f..32d8c4144cef 100644
--- a/sw/qa/uitest/writer_tests4/tdf113284.py
+++ b/sw/qa/uitest/writer_tests4/tdf113284.py
@@ -18,14 +18,14 @@ class tdf113284(UITestCase):
         xToolkit.processEventsToIdle()
 
         xPageCount = writer_doc.CurrentController.PageCount
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog:
             xPageText = xDialog.getChild("page")
             xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":str(xPageCount)})) # goto last page
 
         xToolkit.processEventsToIdle()
 
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], str(xPageCount))
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex", close_button="cancel"):
             pass
 
         #page count  is not constant
diff --git a/sw/qa/uitest/writer_tests4/tdf115572.py b/sw/qa/uitest/writer_tests4/tdf115572.py
index 7abfcae3f365..1f1a0e6e1850 100644
--- a/sw/qa/uitest/writer_tests4/tdf115572.py
+++ b/sw/qa/uitest/writer_tests4/tdf115572.py
@@ -19,7 +19,7 @@ class tdf115572(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -33,7 +33,7 @@ class tdf115572(UITestCase):
         self.xUITest.executeCommand(".uno:GoLeft")
         self.xUITest.executeCommand(".uno:GoLeft")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
@@ -46,7 +46,7 @@ class tdf115572(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -57,7 +57,7 @@ class tdf115572(UITestCase):
         #delete column
         self.xUITest.executeCommand(".uno:DeleteColumns")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
diff --git a/sw/qa/uitest/writer_tests4/tdf115573.py b/sw/qa/uitest/writer_tests4/tdf115573.py
index 5e40d8c09420..cbbf8ea48367 100644
--- a/sw/qa/uitest/writer_tests4/tdf115573.py
+++ b/sw/qa/uitest/writer_tests4/tdf115573.py
@@ -19,7 +19,7 @@ class tdf115573(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -33,7 +33,7 @@ class tdf115573(UITestCase):
         self.xUITest.executeCommand(".uno:GoUp")
         self.xUITest.executeCommand(".uno:GoUp")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
@@ -46,7 +46,7 @@ class tdf115573(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -60,7 +60,7 @@ class tdf115573(UITestCase):
         self.xUITest.executeCommand(".uno:GoUp")
         self.xUITest.executeCommand(".uno:GoUp")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
@@ -73,7 +73,7 @@ class tdf115573(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -82,7 +82,7 @@ class tdf115573(UITestCase):
         #insert column left
         self.xUITest.executeCommand(".uno:InsertColumnsBefore")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
@@ -95,7 +95,7 @@ class tdf115573(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #insert table 2x2
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #select font format - Bold and write text "abc"
         self.xUITest.executeCommand(".uno:Bold")
@@ -104,7 +104,7 @@ class tdf115573(UITestCase):
         #insert column left
         self.xUITest.executeCommand(".uno:InsertColumnsAfter")
         #check the format of the text (should be still bold) Format-Character-Font-Style-Bold
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")
             xweststylelbcjk = xDialog.getChild("weststylelb-cjk")
diff --git a/sw/qa/uitest/writer_tests4/tdf122449.py b/sw/qa/uitest/writer_tests4/tdf122449.py
index 23c57ef6b64e..c071745d024c 100644
--- a/sw/qa/uitest/writer_tests4/tdf122449.py
+++ b/sw/qa/uitest/writer_tests4/tdf122449.py
@@ -31,11 +31,11 @@ class tdf122449(UITestCase):
             self.ui_test.close_dialog_through_button(xcloseBtn)
             xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "HOME"}))
             # invoke Index dialog Index entry   .uno:IndexEntryDialog
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:IndexEntryDialog", close_button="close"):
+            with self.ui_test.execute_dialog_through_command(".uno:IndexEntryDialog", close_button="close"):
                 pass
             # close
             # Go to page 2
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog:
                 xPageText = xDialog.getChild("page")
                 xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"2"}))
             # verify
diff --git a/sw/qa/uitest/writer_tests4/tdf138546.py b/sw/qa/uitest/writer_tests4/tdf138546.py
index 4cbec4d3a49c..761aa26e523b 100644
--- a/sw/qa/uitest/writer_tests4/tdf138546.py
+++ b/sw/qa/uitest/writer_tests4/tdf138546.py
@@ -18,14 +18,14 @@ class tdf138546(UITestCase):
             change_measurement_unit(self, "Centimeter")
 
             #dialog Columns
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns", close_button="cancel") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatColumns", close_button="cancel") as xDialog:
 
                 colsnf = xDialog.getChild("colsnf")
                 width1mf = xDialog.getChild("width1mf")
                 self.assertEqual(get_state_as_dict(colsnf)["Text"], "2")
                 self.assertEqual((get_state_as_dict(width1mf)["Text"])[0:3], "2.0") #2.00 cm
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog:
                 tabcontrol = xDialog.getChild("tabcontrol")
                 select_pos(tabcontrol, "7") #Columns
                 colsnf = xDialog.getChild("colsnf")
diff --git a/sw/qa/uitest/writer_tests4/tdf51352.py b/sw/qa/uitest/writer_tests4/tdf51352.py
index 773f9518fa89..9382c8ef7792 100644
--- a/sw/qa/uitest/writer_tests4/tdf51352.py
+++ b/sw/qa/uitest/writer_tests4/tdf51352.py
@@ -19,11 +19,11 @@ class tdf51352(UITestCase):
         #1. New a text document
         #2. Insert a table and then in one cell create another table
         #-insert a table (by default 2x2)
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #-put the cursor inside first cell top left for example
         #-insert an inner table (by default 2x2) inside this cell
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertTable"):
             pass
         #3. Select the first table
         xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
@@ -33,7 +33,7 @@ class tdf51352(UITestCase):
         xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
         self.assertEqual(document.TextTables.getCount(), 2)
         #4. From menu "Table->Convert->Table to Text
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText"):
+        with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText"):
             pass
         self.assertEqual(document.TextTables.getCount(), 0)
         #5. Undo/Redo
diff --git a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
index 815de4f9dc2f..fb4a3098d19f 100644
--- a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
+++ b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
@@ -15,7 +15,7 @@ class dateFormFieldDialog(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("date_formats_treeview")
 
@@ -29,7 +29,7 @@ class dateFormFieldDialog(UITestCase):
 
 
             # open the dialog again
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
                 itemsList = xDialog.getChild("date_formats_treeview")
                 self.assertEqual(get_state_as_dict(itemsList)["SelectEntryText"], "12-31")
 
@@ -40,7 +40,7 @@ class dateFormFieldDialog(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("date_formats_treeview")
 
@@ -56,7 +56,7 @@ class dateFormFieldDialog(UITestCase):
             self.assertEqual(writer_doc.getText().getString(), "07/17/19")
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("date_formats_treeview")
 
@@ -79,7 +79,7 @@ class dateFormFieldDialog(UITestCase):
             self.assertEqual(writer_doc.getText().getString(), "[select date]")
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("date_formats_treeview")
 
@@ -105,7 +105,7 @@ class dateFormFieldDialog(UITestCase):
             self.assertEqual(writer_doc.getText().getString(), "07/17/19")
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("date_formats_treeview")
 
diff --git a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
index f37691efa313..2ba000000a1b 100644
--- a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
+++ b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
@@ -17,7 +17,7 @@ class dropDownFormFieldDialog(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemEntry = xDialog.getChild("item_entry")
                 addButton = xDialog.getChild("add_button")
@@ -49,7 +49,7 @@ class dropDownFormFieldDialog(UITestCase):
 
 
             # check whether items are the same after reopening
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("items_treeview")
                 self.assertEqual(get_state_as_dict(itemsList)["Children"], "4")
@@ -66,7 +66,7 @@ class dropDownFormFieldDialog(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemEntry = xDialog.getChild("item_entry")
                 addButton = xDialog.getChild("add_button")
@@ -110,7 +110,7 @@ class dropDownFormFieldDialog(UITestCase):
 
 
             # check whether items are the same after reopening
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("items_treeview")
                 removeButton = xDialog.getChild("remove_button")
@@ -136,7 +136,7 @@ class dropDownFormFieldDialog(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             # open the dialog (cursor is at the field)
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemEntry = xDialog.getChild("item_entry")
                 addButton = xDialog.getChild("add_button")
@@ -200,7 +200,7 @@ class dropDownFormFieldDialog(UITestCase):
 
 
             # check whether items are the same after reopening
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                 itemsList = xDialog.getChild("items_treeview")
                 self.assertEqual(get_state_as_dict(itemsList)["Children"], "4")
@@ -219,7 +219,7 @@ class dropDownFormFieldDialog(UITestCase):
                 xWriterDoc = self.xUITest.getTopFocusWindow()
 
                 # open the dialog (cursor is at the field)
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog:
 
                     itemsList = xDialog.getChild("items_treeview")
 
diff --git a/sw/qa/uitest/writer_tests5/about_test.py b/sw/qa/uitest/writer_tests5/about_test.py
index ab301efa0074..83117572d72e 100644
--- a/sw/qa/uitest/writer_tests5/about_test.py
+++ b/sw/qa/uitest/writer_tests5/about_test.py
@@ -13,7 +13,7 @@ class AboutDlgTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:About", close_button="btnClose"):
+        with self.ui_test.execute_dialog_through_command(".uno:About", close_button="btnClose"):
             pass
 
         self.ui_test.close_doc()
diff --git a/sw/qa/uitest/writer_tests5/autocorrectOptions.py b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
index 828fdd26a661..4417837d33e7 100644
--- a/sw/qa/uitest/writer_tests5/autocorrectOptions.py
+++ b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
@@ -16,7 +16,7 @@ class autocorrectOptions(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", close_button="cancel") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "0")       #tab replace
             origtext = xDialog.getChild("origtext")
diff --git a/sw/qa/uitest/writer_tests5/columns.py b/sw/qa/uitest/writer_tests5/columns.py
index 172f4fbf4f0d..fc3827fc5d85 100644
--- a/sw/qa/uitest/writer_tests5/columns.py
+++ b/sw/qa/uitest/writer_tests5/columns.py
@@ -19,7 +19,7 @@ class columns(UITestCase):
         change_measurement_unit(self, "Centimeter")
 
         #dialog Columns
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatColumns") as xDialog:
 
             colsnf = xDialog.getChild("colsnf")
             colsnf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
@@ -34,7 +34,7 @@ class columns(UITestCase):
             autowidth = xDialog.getChild("autowidth")
             autowidth.executeAction("CLICK", tuple())
         #verify
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatColumns", close_button="cancel") as xDialog:
             colsnf = xDialog.getChild("colsnf")
             spacing1mf = xDialog.getChild("spacing1mf")
             autowidth = xDialog.getChild("autowidth")
diff --git a/sw/qa/uitest/writer_tests5/tdf107494.py b/sw/qa/uitest/writer_tests5/tdf107494.py
index 5939c6f18eb2..c1a066c5586c 100644
--- a/sw/qa/uitest/writer_tests5/tdf107494.py
+++ b/sw/qa/uitest/writer_tests5/tdf107494.py
@@ -38,7 +38,7 @@ class tdf107494(UITestCase):
         textGraphic.Graphic = graphic
         text.insertTextContent(cursor, textGraphic, False)
         # Delete the header
-        with self.ui_test.execute_dialog_through_command_guarded(
+        with self.ui_test.execute_dialog_through_command(
                 ".uno:InsertPageHeader?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"):
             pass
 
@@ -73,7 +73,7 @@ class tdf107494(UITestCase):
         textGraphic.Graphic = graphic
         text.insertTextContent(cursor, textGraphic, False)
         # Delete the footer
-        with self.ui_test.execute_dialog_through_command_guarded(
+        with self.ui_test.execute_dialog_through_command(
                 ".uno:InsertPageFooter?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"):
             pass
 
diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py b/sw/qa/uitest/writer_tests5/tdf118540.py
index 947d9115e2e6..e33cad63b888 100644
--- a/sw/qa/uitest/writer_tests5/tdf118540.py
+++ b/sw/qa/uitest/writer_tests5/tdf118540.py
@@ -16,7 +16,7 @@ class tdf118540(UITestCase):
    def test_tdf118540_preview_document_properties(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf118540.docx")) as writer_doc:
             self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties"):
+            with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties"):
                 pass
             self.xUITest.executeCommand(".uno:ClosePreview")  # close print preview
 
diff --git a/sw/qa/uitest/writer_tests5/tdf122045.py b/sw/qa/uitest/writer_tests5/tdf122045.py
index cf625f7344f7..a6b3a6348516 100644
--- a/sw/qa/uitest/writer_tests5/tdf122045.py
+++ b/sw/qa/uitest/writer_tests5/tdf122045.py
@@ -16,7 +16,7 @@ class tdf122045(UITestCase):
         xWriterDoc = self.xUITest.getTopFocusWindow()
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog:
 
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "2")
diff --git a/sw/qa/uitest/writer_tests5/tdf122722.py b/sw/qa/uitest/writer_tests5/tdf122722.py
index 67e9ccb5ff53..090337dd2273 100644
--- a/sw/qa/uitest/writer_tests5/tdf122722.py
+++ b/sw/qa/uitest/writer_tests5/tdf122722.py
@@ -27,7 +27,7 @@ class tdf122722(UITestCase):
         #6. Opened Character, Select "Font Effect" tab
         #7. Check Hidden, and click [OK]
         #8. Crash a LibreOffice
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
@@ -43,7 +43,7 @@ class tdf122722(UITestCase):
             xHidden.executeAction("CLICK", tuple())
 
         #un-hidden
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
 
diff --git a/sw/qa/uitest/writer_tests5/tdf123446.py b/sw/qa/uitest/writer_tests5/tdf123446.py
index 6d9c3a2c9e73..a337efafe840 100644
--- a/sw/qa/uitest/writer_tests5/tdf123446.py
+++ b/sw/qa/uitest/writer_tests5/tdf123446.py
@@ -26,7 +26,7 @@ class tdf123446(UITestCase):
         self.xUITest.executeCommand(".uno:GoLeft")
         self.xUITest.executeCommand(".uno:GoLeft")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertMultiIndex"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertMultiIndex"):
             pass
         #- Undo the ToC insertion.
         self.xUITest.executeCommand(".uno:Undo")
diff --git a/sw/qa/uitest/writer_tests5/titlePage.py b/sw/qa/uitest/writer_tests5/titlePage.py
index 390e0bb4fa68..06b8b8ea3eb0 100644
--- a/sw/qa/uitest/writer_tests5/titlePage.py
+++ b/sw/qa/uitest/writer_tests5/titlePage.py
@@ -13,7 +13,7 @@ class titlePage(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #dialog Title Page
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
             #select new Pages; nr of pages =2 (click UP), save; verify pageCount = 3
             newPages = xDialog.getChild("RB_INSERT_NEW_PAGES")
             newPages.executeAction("CLICK", tuple())
@@ -22,7 +22,7 @@ class titlePage(UITestCase):
         self.assertEqual(document.CurrentController.PageCount, 3)
 
         # check cancel button
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog", close_button="cancel"):
+        with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog", close_button="cancel"):
             pass
         self.assertEqual(document.CurrentController.PageCount, 3)
 
diff --git a/sw/qa/uitest/writer_tests5/titlePageWizard.py b/sw/qa/uitest/writer_tests5/titlePageWizard.py
index b2b43ce3f9ca..c47e23c10d62 100644
--- a/sw/qa/uitest/writer_tests5/titlePageWizard.py
+++ b/sw/qa/uitest/writer_tests5/titlePageWizard.py
@@ -36,7 +36,7 @@ class tdf138907(UITestCase):
 
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #set restart page number to 2. With this doc, it defaults to resetting to 1.
                 xRestartNumbering = xDialog.getChild("NF_RESTART_NUMBERING")
                 xRestartNumbering.executeAction("UP", tuple()) # restart numbering at 2
@@ -51,7 +51,7 @@ class tdf138907(UITestCase):
             self.assertEqual(Para2.PageDescName, "Landscape")
 
             #re-run dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog"):
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog"):
                 pass
 
             # Without this fix, re-running the wizard was failing with the title page restarting at page 2.
@@ -69,7 +69,7 @@ class tdf138907(UITestCase):
             #Now test replacing several pages with title and index styles
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #Convert three pages to title/index pages starting at page two.
                 xPageCount = xDialog.getChild("NF_PAGE_COUNT")
                 for _ in range(0,2):
@@ -101,7 +101,7 @@ class tdf138907(UITestCase):
             #Now test inserting at the end of the document
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #Insert three title/index pages at the end of the document (plus a content page).
                 newPages = xDialog.getChild("RB_INSERT_NEW_PAGES")
                 newPages.executeAction("CLICK", tuple())
@@ -129,7 +129,7 @@ class tdf138907(UITestCase):
             #Now test inserting in the middle of the document
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #Insert three title/index pages starting at page 2.
                 newPages = xDialog.getChild("RB_INSERT_NEW_PAGES")
                 newPages.executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/writer_tests5/titlePageWizard2.py b/sw/qa/uitest/writer_tests5/titlePageWizard2.py
index b3f7d15c3320..313638de9eae 100644
--- a/sw/qa/uitest/writer_tests5/titlePageWizard2.py
+++ b/sw/qa/uitest/writer_tests5/titlePageWizard2.py
@@ -15,7 +15,7 @@ class tdf138907(UITestCase):
             # Test an undefined situation - try to modify pages beyond the end of the document.
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #set restart page number to 2. With this doc, it defaults to resetting to 1.
                 xRestartNumbering = xDialog.getChild("NF_RESTART_NUMBERING")
                 xRestartNumbering.executeAction("UP", tuple()) # restart numbering at 2
@@ -53,7 +53,7 @@ class tdf138907(UITestCase):
 
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 #set restart page number to 1 - which is the default.
                 #set restart title page to 1 - the current value for this document is 6.
                 xRestartNumbering = xDialog.getChild("NF_SET_PAGE_NUMBER")
@@ -90,7 +90,7 @@ class tdf138907(UITestCase):
             #Now test replacing several pages with title and index styles
 
             #dialog Title Page
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog:
                 print(xDialog.getChildren())
                 #Convert four pages to title/index pages starting at page one.
                 xPageCount = xDialog.getChild("NF_PAGE_COUNT")
diff --git a/sw/qa/uitest/writer_tests5/zoom.py b/sw/qa/uitest/writer_tests5/zoom.py
index 05024eeed487..7e647e622fbd 100644
--- a/sw/qa/uitest/writer_tests5/zoom.py
+++ b/sw/qa/uitest/writer_tests5/zoom.py
@@ -15,7 +15,7 @@ class writerZoom(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
         #dialog View-Zoom-Zoom
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
 
             #select Optimal & Automatic - OK - open and verify
             optimal = xDialog.getChild("optimal")
@@ -23,7 +23,7 @@ class writerZoom(UITestCase):
             automatic = xDialog.getChild("automatic")
             automatic.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             optimal = xDialog.getChild("optimal")
             automatic = xDialog.getChild("automatic")
             self.assertEqual(get_state_as_dict(optimal)["Checked"], "true")
@@ -34,7 +34,7 @@ class writerZoom(UITestCase):
             fitwandh.executeAction("CLICK", tuple())
             singlepage.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             singlepage = xDialog.getChild("singlepage")
             fitwandh = xDialog.getChild("fitwandh")
             self.assertEqual(get_state_as_dict(singlepage)["Checked"], "true")
@@ -49,7 +49,7 @@ class writerZoom(UITestCase):
             columnssb.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
             columnssb.executeAction("TYPE", mkPropertyValues({"TEXT":"3"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             fitw = xDialog.getChild("fitw")
             columnssb = xDialog.getChild("columnssb")
             columns = xDialog.getChild("columns")
@@ -62,7 +62,7 @@ class writerZoom(UITestCase):
             x100pc.executeAction("CLICK", tuple())
             automatic.executeAction("CLICK", tuple())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             automatic = xDialog.getChild("automatic")
             x100pc = xDialog.getChild("100pc")
             self.assertEqual(get_state_as_dict(automatic)["Checked"], "true")
@@ -75,7 +75,7 @@ class writerZoom(UITestCase):
             zoomsb.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
             zoomsb.executeAction("TYPE", mkPropertyValues({"TEXT":"101"}))
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog:
             variable = xDialog.getChild("variable")
             zoomsb = xDialog.getChild("zoomsb")
             self.assertEqual(get_state_as_dict(variable)["Checked"], "true")
diff --git a/sw/qa/uitest/writer_tests6/tdf107847.py b/sw/qa/uitest/writer_tests6/tdf107847.py
index 99705d6c2203..9fc02be4e8ac 100644
--- a/sw/qa/uitest/writer_tests6/tdf107847.py
+++ b/sw/qa/uitest/writer_tests6/tdf107847.py
@@ -15,7 +15,7 @@ class tdf107847(UITestCase):
         document = self.ui_test.get_component()
         xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFrame") as xDialog:
             xTabs = xDialog.getChild("tabcontrol")
             select_pos(xTabs, "1")
             select_pos(xTabs, "2")
diff --git a/sw/qa/uitest/writer_tests6/tdf120731.py b/sw/qa/uitest/writer_tests6/tdf120731.py
index fdcc17dcd334..b7a7f53f10d8 100644
--- a/sw/qa/uitest/writer_tests6/tdf120731.py
+++ b/sw/qa/uitest/writer_tests6/tdf120731.py
@@ -15,7 +15,7 @@ class tdf120731(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             self.xUITest.executeCommand(".uno:SelectAll")
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog"):
+            with self.ui_test.execute_dialog_through_command(".uno:FontDialog"):
                 pass
             self.assertEqual(writer_doc.Text.String[0:5], "Lorem")
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_tests6/tdf124586.py b/sw/qa/uitest/writer_tests6/tdf124586.py
index 23c5e5700a69..a8d056fced63 100644
--- a/sw/qa/uitest/writer_tests6/tdf124586.py
+++ b/sw/qa/uitest/writer_tests6/tdf124586.py
@@ -16,13 +16,13 @@ class tdf124586(UITestCase):
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
             #Goto Tools > Chapter Numbering.
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog:
                 xstyle = xDialog.getChild("style")
                 select_by_text(xstyle, "MyHeading")
 
             self.assertEqual(writer_doc.Text.String[0:8], "Schritte")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog:
                 xstyle = xDialog.getChild("style")
                 self.assertEqual(get_state_as_dict(xstyle)["SelectEntryText"], "MyHeading")
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py b/sw/qa/uitest/writer_tests6/tdf125104.py
index 8b56104f123a..c27482195753 100644
--- a/sw/qa/uitest/writer_tests6/tdf125104.py
+++ b/sw/qa/uitest/writer_tests6/tdf125104.py
@@ -30,19 +30,19 @@ class tdf125104(UITestCase):
         self.assertEqual(text[2:3], "2")
 
         # Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes crashes when trying to change Page settings later
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             self.set_combo_layout_format(xDialog, "1st, 2nd, 3rd, ...")
 
         text = document.Text.String.replace('\r\n', '\n')
         self.assertEqual(text[0:3], "1st")
         self.assertEqual(text[4:7], "2nd")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog:
             comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
             self.assertEqual(get_state_as_dict(comboLayoutFormat)["SelectEntryText"], "1st, 2nd, 3rd, ...")
 
         # change to devanagari alphabet format
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             self.set_combo_layout_format(xDialog, "क, ख, ग, ...")
 
         text = document.Text.String.replace('\r\n', '\n')
@@ -50,7 +50,7 @@ class tdf125104(UITestCase):
         self.assertEqual(text[2:3], "ख")
 
         # change to devanagari number format
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             self.set_combo_layout_format(xDialog, "१, २, ३, ...")
 
         text = document.Text.String.replace('\r\n', '\n')
diff --git a/sw/qa/uitest/writer_tests6/tdf126017.py b/sw/qa/uitest/writer_tests6/tdf126017.py
index 6894b550b479..b2255c31cdeb 100644
--- a/sw/qa/uitest/writer_tests6/tdf126017.py
+++ b/sw/qa/uitest/writer_tests6/tdf126017.py
@@ -25,13 +25,13 @@ class tdf126017(UITestCase):
             xcloseBtn = xDialog.getChild("close")
             self.ui_test.close_dialog_through_button(xcloseBtn)
             #edit index
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex") as xDiagIndex:
+            with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex") as xDiagIndex:
                 title = xDiagIndex.getChild("title")
                 title.executeAction("TYPE", mkPropertyValues({"TEXT":"aaaa"}))
 
             self.xUITest.executeCommand(".uno:Undo")
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex") as xDiagIndex:
+            with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex") as xDiagIndex:
                 title = xDiagIndex.getChild("title")
                 title.executeAction("TYPE", mkPropertyValues({"TEXT":"aaaa"}))
 
diff --git a/sw/qa/uitest/writer_tests6/tdf126168.py b/sw/qa/uitest/writer_tests6/tdf126168.py
index 5d65724c4bf1..8c9794a17545 100644
--- a/sw/qa/uitest/writer_tests6/tdf126168.py
+++ b/sw/qa/uitest/writer_tests6/tdf126168.py
@@ -18,11 +18,11 @@ class tdf126168(UITestCase):
 
         #2) Menu > Insert > Frame > Frame
         #3) Press OK in Frame dialog
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertFrame"):
             pass
         self.assertEqual(document.TextFrames.getCount(), 1)
         #New Style from Selection  [uno:StyleNewByExample]
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:StyleNewByExample") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:StyleNewByExample") as xDialog:
             #5) Enter a name in the Create Style dialog and press OK
             stylename = xDialog.getChild("stylename")
             stylename.executeAction("TYPE", mkPropertyValues({"TEXT":"a"}))
diff --git a/sw/qa/uitest/writer_tests6/tdf126226.py b/sw/qa/uitest/writer_tests6/tdf126226.py
index c638574d141d..4dfc6c1e7817 100644
--- a/sw/qa/uitest/writer_tests6/tdf126226.py
+++ b/sw/qa/uitest/writer_tests6/tdf126226.py
@@ -15,7 +15,7 @@ class Tdf126226(UITestCase):
             self.xUITest.executeCommand(".uno:SelectAll")
 
             # Without the fix in place, this test would have crashed here
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:CommentChangeTracking") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:CommentChangeTracking") as xDialog:
 
 
                 self.assertEqual("Hello\n", get_state_as_dict(xDialog.getChild("edit"))["Text"])
diff --git a/sw/qa/uitest/writer_tests6/tdf128431.py b/sw/qa/uitest/writer_tests6/tdf128431.py
index 2e53b2eb8054..f09d23597fcd 100644
--- a/sw/qa/uitest/writer_tests6/tdf128431.py
+++ b/sw/qa/uitest/writer_tests6/tdf128431.py
@@ -17,7 +17,7 @@ class tdf128431(UITestCase):
 
         change_measurement_unit(self, "Centimeter")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, 6) #borders
 
diff --git a/sw/qa/uitest/writer_tests6/tdf131041.py b/sw/qa/uitest/writer_tests6/tdf131041.py
index 8ba2fc2fabbb..4c07a5516d6f 100644
--- a/sw/qa/uitest/writer_tests6/tdf131041.py
+++ b/sw/qa/uitest/writer_tests6/tdf131041.py
@@ -13,7 +13,7 @@ class tdf131041(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
         document = self.ui_test.get_component()
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
             tabcontrol = xDialog.getChild("tabcontrol")
             select_pos(tabcontrol, 4) #header
 
diff --git a/sw/qa/uitest/writer_tests7/apply_line_cap.py b/sw/qa/uitest/writer_tests7/apply_line_cap.py
index 9e308acc0ff8..7df47a6b52b5 100644
--- a/sw/qa/uitest/writer_tests7/apply_line_cap.py
+++ b/sw/qa/uitest/writer_tests7/apply_line_cap.py
@@ -22,7 +22,7 @@ class apply_line_cap(UITestCase):
             self.ui_test.wait_until_child_is_available('metricfield')
 
             # line setting dialog window
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
 
                 # get cap style combo box
                 xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE")
@@ -46,7 +46,7 @@ class apply_line_cap(UITestCase):
             self.ui_test.wait_until_child_is_available('metricfield')
 
             # line setting dialog window
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
 
                 # get cap style combo box
                 xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE")
@@ -71,7 +71,7 @@ class apply_line_cap(UITestCase):
             self.ui_test.wait_until_child_is_available('metricfield')
 
             # line setting dialog window
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
 
                 # get cap style combo box
                 xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE")
diff --git a/sw/qa/uitest/writer_tests7/tdf104795.py b/sw/qa/uitest/writer_tests7/tdf104795.py
index 00b71bb2b97c..98be1cf366b2 100644
--- a/sw/qa/uitest/writer_tests7/tdf104795.py
+++ b/sw/qa/uitest/writer_tests7/tdf104795.py
@@ -14,7 +14,7 @@ class tdf104795(UITestCase):
 
    def test_tdf104795(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf104795.odt")) as writer_doc:
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog:
 
                 sShowSignedText = get_state_as_dict(xDialog.getChild('showsigned'))['Text']
 
diff --git a/sw/qa/uitest/writer_tests7/tdf109083.py b/sw/qa/uitest/writer_tests7/tdf109083.py
index eb83582b4431..500bc7150ddc 100644
--- a/sw/qa/uitest/writer_tests7/tdf109083.py
+++ b/sw/qa/uitest/writer_tests7/tdf109083.py
@@ -18,7 +18,7 @@ class tdf109083(UITestCase):
         #generate two 2x2 tables with the same autoformat table style (Default Table Style)
         #Note that this style is different than applying nothing!
         for i in range(0, 2):
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
                 formatlbinstable = xDialog.getChild("formatlbinstable")
                 entry = formatlbinstable.getChild("1")
                 entry.executeAction("SELECT", tuple())
@@ -45,7 +45,7 @@ class tdf109083(UITestCase):
 
         #first row's cells must be yellow, second/last row's cells must be updated to yellow by now
         for i in range (0,4):
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
                 xTabs = xDialog.getChild("tabcontrol")
                 select_pos(xTabs, "4")   #tab Background
                 btncolor = xDialog.getChild("btncolor")
diff --git a/sw/qa/uitest/writer_tests7/tdf115853.py b/sw/qa/uitest/writer_tests7/tdf115853.py
index 05825bf15043..fb0a0966a27c 100644
--- a/sw/qa/uitest/writer_tests7/tdf115853.py
+++ b/sw/qa/uitest/writer_tests7/tdf115853.py
@@ -16,7 +16,7 @@ class tdf115853(UITestCase):
 
     def test_tdf115853(self):
         self.ui_test.create_doc_in_start_center("writer")
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog:
 
             xTabs = xDialog.getChild("tabcontrol")
 
diff --git a/sw/qa/uitest/writer_tests7/tdf119661.py b/sw/qa/uitest/writer_tests7/tdf119661.py
index afdbba2dd99c..e1464b962c99 100644
--- a/sw/qa/uitest/writer_tests7/tdf119661.py
+++ b/sw/qa/uitest/writer_tests7/tdf119661.py
@@ -17,7 +17,7 @@ class tdf119661(UITestCase):
 
         self.ui_test.create_doc_in_start_center("writer")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertGraphic", close_button="") as xOpenDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", close_button="") as xOpenDialog:
             xFileName = xOpenDialog.getChild("file_name")
             xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("LibreOffice.jpg")}))
 
@@ -34,7 +34,7 @@ class tdf119661(UITestCase):
             xOK = xWarnDialog.getChild("ok")
             self.ui_test.close_dialog_through_button(xOK)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:LinkDialog", close_button="close") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:LinkDialog", close_button="close") as xDialog:
 
 
             sLinks = "TB_LINKS"
@@ -57,7 +57,7 @@ class tdf119661(UITestCase):
             xFilePath = os.path.join(tempdir, "tdf119661-tmp.odt")
 
             # Save Copy as
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SaveAs", close_button="open") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SaveAs", close_button="open") as xDialog:
 
                 xFileName = xDialog.getChild("file_name")
                 xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sw/qa/uitest/writer_tests7/tdf122780.py b/sw/qa/uitest/writer_tests7/tdf122780.py
index a128f95eaf1c..957ef31dfd13 100644
--- a/sw/qa/uitest/writer_tests7/tdf122780.py
+++ b/sw/qa/uitest/writer_tests7/tdf122780.py
@@ -14,7 +14,7 @@ class tdf122780(UITestCase):
 
    def test_tdf122780(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf122780.docx")) as writer_doc:
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog:
 
                 # Without the fix in place, this test would have hung here
                 self.assertEqual("Normal_x005F", get_state_as_dict(xDialog.getChild('showtemplate'))['Text'][:12])
diff --git a/sw/qa/uitest/writer_tests7/tdf131936.py b/sw/qa/uitest/writer_tests7/tdf131936.py
index 07298084b2a7..773386b658ff 100644
--- a/sw/qa/uitest/writer_tests7/tdf131936.py
+++ b/sw/qa/uitest/writer_tests7/tdf131936.py
@@ -12,7 +12,7 @@ class tdf131936(UITestCase):
     def test_tdf131936_saveas_docx_version(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf131936.docx")):
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:SaveAs", close_button="cancel") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:SaveAs", close_button="cancel") as xDialog:
                 time.sleep(DEFAULT_SLEEP)
                 xFileTypeCombo = xDialog.getChild("file_type")
                 state = get_state_as_dict(xFileTypeCombo)
diff --git a/sw/qa/uitest/writer_tests7/tdf132169.py b/sw/qa/uitest/writer_tests7/tdf132169.py
index 2466a7cb5545..393b6e1fa098 100644
--- a/sw/qa/uitest/writer_tests7/tdf132169.py
+++ b/sw/qa/uitest/writer_tests7/tdf132169.py
@@ -23,7 +23,7 @@ class tdf132169(UITestCase):
             self.assertEqual(get_state_as_dict(xLineMetric)["Text"], "0.0 pt")
 
             #Check changing value from dialog also works
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
                 xWidth = xFormatLineDlg.getChild('MTR_FLD_LINE_WIDTH')
                 type_text(xWidth, "4.0")
 
diff --git a/sw/qa/uitest/writer_tests7/tdf133348.py b/sw/qa/uitest/writer_tests7/tdf133348.py
index c5ebb726f4f9..a479b408a856 100644
--- a/sw/qa/uitest/writer_tests7/tdf133348.py
+++ b/sw/qa/uitest/writer_tests7/tdf133348.py
@@ -21,7 +21,7 @@ class tdf133348(UITestCase):
         xArgs = mkPropertyValues({"Text": "C1"})
         self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", xArgs)
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+        with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
             xPages = xDialogOpt.getChild("pages")
             xEntry = xPages.getChild('0')
             xEntry.executeAction("EXPAND", tuple())
diff --git a/sw/qa/uitest/writer_tests7/tdf134243.py b/sw/qa/uitest/writer_tests7/tdf134243.py
index 1e1c4a5db3f4..7ee7976ce18b 100644
--- a/sw/qa/uitest/writer_tests7/tdf134243.py
+++ b/sw/qa/uitest/writer_tests7/tdf134243.py
@@ -13,7 +13,7 @@ class tdf134243(UITestCase):
         with self.ui_test.load_file(get_url_for_data_file("tdf134243.odt")) as writer_doc:
 
             # Without the fix in place, it would hung launching the mailmerge wizard
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:MailMergeWizard", close_button="cancel"):
+            with self.ui_test.execute_dialog_through_command(".uno:MailMergeWizard", close_button="cancel"):
                 pass
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_tests7/tdf137802.py b/sw/qa/uitest/writer_tests7/tdf137802.py
index c91642c2f9a3..424375b3df38 100644
--- a/sw/qa/uitest/writer_tests7/tdf137802.py
+++ b/sw/qa/uitest/writer_tests7/tdf137802.py
@@ -25,7 +25,7 @@ class tdf137802(UITestCase):
 
             self.ui_test.wait_until_child_is_available('metricfield')
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
 
 
                 xDialog.getChild('topage').executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/writer_tests7/tdf137803.py b/sw/qa/uitest/writer_tests7/tdf137803.py
index 3fceb5cb814e..b1621adf55dd 100644
--- a/sw/qa/uitest/writer_tests7/tdf137803.py
+++ b/sw/qa/uitest/writer_tests7/tdf137803.py
@@ -18,7 +18,7 @@ class tdf137803(UITestCase):
             self.ui_test.wait_until_child_is_available('metricfield')
 
             # open textattrs dialog
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TextAttributes") as TextDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TextAttributes") as TextDialog:
 
                 # check autosize on
                 TSB_AUTOGROW_SIZE = TextDialog.getChild('TSB_AUTOGROW_SIZE')
diff --git a/sw/qa/uitest/writer_tests7/tdf139301.py b/sw/qa/uitest/writer_tests7/tdf139301.py
index d62e0db3c290..e34dce1fb31b 100644
--- a/sw/qa/uitest/writer_tests7/tdf139301.py
+++ b/sw/qa/uitest/writer_tests7/tdf139301.py
@@ -22,7 +22,7 @@ class tdf139301(UITestCase):
                 self.ui_test.wait_until_child_is_available('metricfield')
 
                 # line setting dialog window
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+                with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
                     # get line style combo box
                     xLineStyle = xFormatLineDlg.getChild("LB_LINE_STYLE")
 
@@ -45,7 +45,7 @@ class tdf139301(UITestCase):
                 self.ui_test.wait_until_child_is_available('metricfield')
 
                 # line setting dialog window
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg:
+                with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg:
                     # get line style combo box
                     xLineStyle = xFormatLineDlg.getChild("LB_LINE_STYLE")
 
diff --git a/sw/qa/uitest/writer_tests7/tdf140117.py b/sw/qa/uitest/writer_tests7/tdf140117.py
index 07437903f755..bf3c69874e25 100644
--- a/sw/qa/uitest/writer_tests7/tdf140117.py
+++ b/sw/qa/uitest/writer_tests7/tdf140117.py
@@ -45,7 +45,7 @@ class tdf140117(UITestCase):
                     elif i == 2:
                             self.assertEqual("XXXXleft", xHeaderLeftText)
 
-                    with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as PageDialog:
+                    with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as PageDialog:
 
                         xTabs = PageDialog.getChild("tabcontrol")
                         select_pos(xTabs, "4")
diff --git a/sw/qa/uitest/writer_tests7/tdf140863.py b/sw/qa/uitest/writer_tests7/tdf140863.py
index bb558c15590b..a1a926af8223 100644
--- a/sw/qa/uitest/writer_tests7/tdf140863.py
+++ b/sw/qa/uitest/writer_tests7/tdf140863.py
@@ -15,7 +15,7 @@ class tdf140863(UITestCase):
         self.ui_test.create_doc_in_start_center("writer")
 
         # Insert one section
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSection"):
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSection"):
             pass
 
         xWriterDoc = self.xUITest.getTopFocusWindow()
@@ -31,7 +31,7 @@ class tdf140863(UITestCase):
         self.assertTrue(document.TextSections.Section1.IsVisible)
 
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditRegion") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditRegion") as xDialog:
             xHide = xDialog.getChild('hide')
             self.assertEqual('false', get_state_as_dict(xHide)['Selected'])
 
@@ -42,7 +42,7 @@ class tdf140863(UITestCase):
         self.assertFalse(document.TextSections.Section1.IsVisible)
         self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "1")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:EditRegion") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:EditRegion") as xDialog:
             xHide = xDialog.getChild('hide')
             self.assertEqual('true', get_state_as_dict(xHide)['Selected'])
 
diff --git a/sw/qa/uitest/writer_tests7/tdf141557.py b/sw/qa/uitest/writer_tests7/tdf141557.py
index 0a15db24dd50..820505f2f43f 100644
--- a/sw/qa/uitest/writer_tests7/tdf141557.py
+++ b/sw/qa/uitest/writer_tests7/tdf141557.py
@@ -23,7 +23,7 @@ class tdf141557(UITestCase):
 
             self.ui_test.wait_until_child_is_available('metricfield')
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog:
+            with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
 
 
                 xDialog.getChild('topara').executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/writer_tests7/tdf46561.py b/sw/qa/uitest/writer_tests7/tdf46561.py
index 41acea93ed16..0eb14bc613c3 100644
--- a/sw/qa/uitest/writer_tests7/tdf46561.py
+++ b/sw/qa/uitest/writer_tests7/tdf46561.py
@@ -37,7 +37,7 @@ class tdf46561(UITestCase):
 
             # Switch "same left and right page headers" on and off a few times
             for _ in range(4):
-                with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as PageDialog:
+                with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as PageDialog:
 
                     xTabs = PageDialog.getChild("tabcontrol")
                     select_pos(xTabs, "4")
diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py b/sw/qa/uitest/writer_tests7/tdf90401.py
index fd8c9b91b135..40b9b483153f 100644
--- a/sw/qa/uitest/writer_tests7/tdf90401.py
+++ b/sw/qa/uitest/writer_tests7/tdf90401.py
@@ -30,7 +30,7 @@ class tdf90401(UITestCase):
 
             # enable remove personal info security option
 
-            with self.ui_test.execute_dialog_through_command_guarded('.uno:OptionsTreeDialog', close_button="") as xDialog:
+            with self.ui_test.execute_dialog_through_command('.uno:OptionsTreeDialog', close_button="") as xDialog:
                 xPages = xDialog.getChild('pages')
                 xGenEntry = xPages.getChild('0')
                 xSecurityPage = xGenEntry.getChild('6')
@@ -55,7 +55,7 @@ class tdf90401(UITestCase):
                 xFilePath = os.path.join(tempdir, 'tdf90401-tmp.fodt')
 
                 # Save Copy as
-                with self.ui_test.execute_dialog_through_command_guarded('.uno:SaveAs', close_button="open") as xDialog:
+                with self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="open") as xDialog:
                     xFileName = xDialog.getChild('file_name')
                     xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'CTRL+A'}))
                     xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'BACKSPACE'}))
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
index 3b7083b1dba1..96028621a25a 100644
--- a/uitest/demo_ui/char_dialog.py
+++ b/uitest/demo_ui/char_dialog.py
@@ -13,7 +13,7 @@ class CharDialogText(UITestCase):
     def test_select_char(self):
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSymbol", close_button="cancel") as xCharDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:InsertSymbol", close_button="cancel") as xCharDialog:
 
             xCharSet = xCharDialog.getChild("showcharset")
 
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index ffee343bf50b..1d0c96902b44 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -15,7 +15,7 @@ class CheckBoxTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xCellsDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xCellsDlg:
             xNegativeNumRedCB = xCellsDlg.getChild("negnumred")
             xNegativeNumRedCB.executeAction("CLICK",tuple())
 
diff --git a/uitest/demo_ui/hierarchy.py b/uitest/demo_ui/hierarchy.py
index 73c15bb607e1..1bfc85d7d99f 100644
--- a/uitest/demo_ui/hierarchy.py
+++ b/uitest/demo_ui/hierarchy.py
@@ -17,7 +17,7 @@ class CheckBoxTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:About", close_button="btnClose") as xAboutDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:About", close_button="btnClose") as xAboutDlg:
 
 
             json_string = xAboutDlg.getHierarchy()
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index 9784178d20a7..3a61d5f9717e 100644
--- a/uitest/demo_ui/listbox.py
+++ b/uitest/demo_ui/listbox.py
@@ -16,7 +16,7 @@ class ListBoxTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog"):
             pass
 
         self.ui_test.close_doc()
@@ -25,7 +25,7 @@ class ListBoxTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog"):
             pass
 
         self.ui_test.close_doc()
diff --git a/uitest/demo_ui/radiobutton.py b/uitest/demo_ui/radiobutton.py
index f3331fa18863..f76192b4ffb0 100644
--- a/uitest/demo_ui/radiobutton.py
+++ b/uitest/demo_ui/radiobutton.py
@@ -27,7 +27,7 @@ class RadioButtonTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xCellsDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xCellsDlg:
             xNegativeNumRedCB = xCellsDlg.getChild("negnumred")
             xNegativeNumRedCB.executeAction("CLICK",tuple())
 
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index a0e983ea81b6..d29ce33141ab 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/uitest/demo_ui/spinfield.py
@@ -16,7 +16,7 @@ class SpinFieldTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xCellsDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xCellsDlg:
 
             xDecimalPlaces = xCellsDlg.getChild("leadzerosed")
             xDecimalPlaces.executeAction("UP", tuple())
@@ -31,7 +31,7 @@ class SpinFieldTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xCellsDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xCellsDlg:
 
             xDecimalPlaces = xCellsDlg.getChild("leadzerosed")
             xDecimalPlaces.executeAction("UP", tuple())
@@ -52,7 +52,7 @@ class SpinFieldTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xCellsDlg:
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xCellsDlg:
         
             xDecimalPlaces = xCellsDlg.getChild("leadzerosed")
             type_text(xDecimalPlaces, "4")
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index bfa6129f06de..95eb3b1e81be 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -16,7 +16,7 @@ class TabDialogTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog"):
             pass
 
         self.ui_test.close_doc()
@@ -25,7 +25,7 @@ class TabDialogTest(UITestCase):
 
         self.ui_test.create_doc_in_start_center("calc")
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog"):
+        with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog"):
             pass
 
         self.ui_test.close_doc()
diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py
index 1ab001fea91f..f37ef2a22a44 100644
--- a/uitest/impress_tests/backgrounds.py
+++ b/uitest/impress_tests/backgrounds.py
@@ -113,7 +113,7 @@ class ImpressBackgrounds(UITestCase):
 
         buttons = ['btnbitmap', 'btncolor', 'btngradient', 'btnhatch', 'btnpattern']
         for index, button in enumerate(buttons):
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as xPageSetupDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as xPageSetupDlg:
 
                 tabcontrol = xPageSetupDlg.getChild("tabcontrol")
                 select_pos(tabcontrol, "1")
@@ -126,7 +126,7 @@ class ImpressBackgrounds(UITestCase):
 
             self.checkDefaultBackground(button)
 
-            with self.ui_test.execute_dialog_through_command_guarded(".uno:PageSetup") as xPageSetupDlg:
+            with self.ui_test.execute_dialog_through_command(".uno:PageSetup") as xPageSetupDlg:
 
                 tabcontrol = xPageSetupDlg.getChild("tabcontrol")
                 select_pos(tabcontrol, "1")
diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index ca09945aeaea..bc1e785f65e3 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -44,7 +44,7 @@ class ImpressDrawinglayerTest(UITestCase):
         xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
         self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Size") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Size") as xDialog:
             self.assertEqual('25.2', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
             self.assertEqual('9.13', get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
             self.assertEqual('2.4', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
@@ -89,7 +89,7 @@ class ImpressDrawinglayerTest(UITestCase):
         xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
         self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Size") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Size") as xDialog:
             self.assertEqual('12.6', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
             self.assertEqual('4.57', get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
             self.assertEqual('0.95', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
@@ -134,7 +134,7 @@ class ImpressDrawinglayerTest(UITestCase):
         xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
         self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
 
-        with self.ui_test.execute_dialog_through_command_guarded(".uno:Size") as xDialog:
+        with self.ui_test.execute_dialog_through_command(".uno:Size") as xDialog:
             self.assertEqual('30', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
 
         self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index dbb2a7c046d5..1e3ddc85747f 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -108,27 +108,23 @@ class UITest(object):
         finally:
             self.close_doc()
 
-    def execute_dialog_through_command(self, command, printNames=False):
+    # Calls UITest.close_dialog_through_button at exit
+    @contextmanager
+    def execute_dialog_through_command(self, command, printNames=False, close_button = "ok"):
         with EventListener(self._xContext, "DialogExecute", printNames=printNames) as event:
             if not self._xUITest.executeDialog(command):
                 raise Exception("Dialog not executed for: " + command)
             while True:
                 if event.executed:
-                    time.sleep(DEFAULT_SLEEP)
+                    xDialog = self._xUITest.getTopFocusWindow()
+                    try:
+                        yield xDialog
+                    finally:
+                        if close_button:
+                            self.close_dialog_through_button(xDialog.getChild(close_button))
                     return
                 time.sleep(DEFAULT_SLEEP)
 
-    # Calls UITest.close_dialog_through_button at exit
-    @contextmanager
-    def execute_dialog_through_command_guarded(self, command, printNames=False, close_button = "ok"):
-        self.execute_dialog_through_command(command, printNames)
-        xDialog = self._xUITest.getTopFocusWindow()
-        try:
-            yield xDialog
-        finally:
-            if close_button:
-                self.close_dialog_through_button(xDialog.getChild(close_button))
-
     def execute_modeless_dialog_through_command(self, command, printNames=False):
         with EventListener(self._xContext, "ModelessDialogVisible", printNames = printNames) as event:
             if not self._xUITest.executeCommand(command):
diff --git a/uitest/uitest/uihelper/common.py b/uitest/uitest/uihelper/common.py
index 726905bee28c..f6146c5e7729 100644
--- a/uitest/uitest/uihelper/common.py
+++ b/uitest/uitest/uihelper/common.py
@@ -28,7 +28,7 @@ def get_url_for_data_file(file_name):
     return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 def change_measurement_unit(UITestCase, unit):
-    with UITestCase.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt:
+    with UITestCase.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
         xPages = xDialogOpt.getChild("pages")
         xAppEntry = xPages.getChild('3')
         xAppEntry.executeAction("EXPAND", tuple())
diff --git a/uitest/uitest/uihelper/testDialog.py b/uitest/uitest/uihelper/testDialog.py
index 9b63159c6148..d1bb47856acf 100644
--- a/uitest/uitest/uihelper/testDialog.py
+++ b/uitest/uitest/uihelper/testDialog.py
@@ -13,7 +13,7 @@ from uitest.uihelper.common import get_state_as_dict
 # the test only checks if LibreOffice crashes by opening the dialog
 def testDialog(UITestCase, app, dialog):
     doc = UITestCase.ui_test.create_doc_in_start_center(app)
-    with UITestCase.ui_test.execute_dialog_through_command_guarded(dialog['command'], close_button=dialog['closeButton']) as xDialog:
+    with UITestCase.ui_test.execute_dialog_through_command(dialog['command'], close_button=dialog['closeButton']) as xDialog:
         if 'skipTestOK' in dialog and dialog['skipTestOK'] == True:
             xOKBtn = None
         else:
@@ -26,7 +26,7 @@ def testDialog(UITestCase, app, dialog):
 
     if (xOKBtn != None):
         print("check also OK button")
-        with UITestCase.ui_test.execute_dialog_through_command_guarded(dialog['command']):
+        with UITestCase.ui_test.execute_dialog_through_command(dialog['command']):
             pass
     UITestCase.ui_test.close_doc()
author	Xisco Fauli <xiscofauli@libreoffice.org>	2021-06-29 11:44:54 +0200
committer	Xisco Fauli <xiscofauli@libreoffice.org>	2021-06-29 15:10:03 +0200
commit	5b8a13486d3809066e663549879c209992d5479d (patch)
tree	8c2701d8827e24eb7f36eb707c20905c41653485
parent	d0172f785a5973dbe5ea585eabfa7a4671b38775 (diff)