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>

14 files changed, 45 insertions, 45 deletions

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")