[Libreoffice-commits] core.git: cui/qa sc/qa sd/qa sfx2/qa svx/qa sw/qa uitest/demo_ui uitest/impress_tests uitest/uitest
Xisco Fauli (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 29 13:10:37 UTC 2021
cui/qa/uitest/dialogs/chardlg.py | 6 -
cui/qa/uitest/dialogs/pastedlg.py | 2
cui/qa/uitest/dialogs/shortcuts.py | 2
sc/qa/uitest/autofilter/autofilterBugs.py | 8 -
sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py | 2
sc/qa/uitest/autofilter/tdf126306.py | 2
sc/qa/uitest/autofilter/tdf140754.py | 2
sc/qa/uitest/autofilter/tdf36383.py | 4
sc/qa/uitest/autofilter/tdf46062.py | 2
sc/qa/uitest/calc_tests/CellDropDownItems.py | 2
sc/qa/uitest/calc_tests/autofill.py | 14 +-
sc/qa/uitest/calc_tests/calcSheetDelete.py | 18 +--
sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py | 6 -
sc/qa/uitest/calc_tests/columns.py | 32 ++---
sc/qa/uitest/calc_tests/formatCells.py | 32 ++---
sc/qa/uitest/calc_tests/mergedRowsColumns.py | 14 +-
sc/qa/uitest/calc_tests/printRange.py | 2
sc/qa/uitest/calc_tests/rows.py | 20 +--
sc/qa/uitest/calc_tests/sheetRename.py | 8 -
sc/qa/uitest/calc_tests/zoom.py | 8 -
sc/qa/uitest/calc_tests2/dataform.py | 2
sc/qa/uitest/calc_tests2/tdf114992.py | 2
sc/qa/uitest/calc_tests2/tdf117367.py | 2
sc/qa/uitest/calc_tests2/tdf126577.py | 2
sc/qa/uitest/calc_tests2/tdf37623.py | 2
sc/qa/uitest/calc_tests2/tdf46138.py | 2
sc/qa/uitest/calc_tests2/tdf51700.py | 2
sc/qa/uitest/calc_tests3/clearCells.py | 16 +-
sc/qa/uitest/calc_tests3/insertQrCodeGen.py | 6 -
sc/qa/uitest/calc_tests3/tdf57274.py | 2
sc/qa/uitest/calc_tests3/tdf62267.py | 4
sc/qa/uitest/calc_tests3/tdf63805.py | 2
sc/qa/uitest/calc_tests3/tdf65856.py | 4
sc/qa/uitest/calc_tests3/tdf69450.py | 4
sc/qa/uitest/calc_tests3/tdf69981.py | 4
sc/qa/uitest/calc_tests3/tdf73006.py | 2
sc/qa/uitest/calc_tests3/tdf79983.py | 4
sc/qa/uitest/calc_tests3/tdf82398.py | 2
sc/qa/uitest/calc_tests4/tdf131170.py | 2
sc/qa/uitest/calc_tests4/tdf85403.py | 2
sc/qa/uitest/calc_tests4/tdf85979.py | 2
sc/qa/uitest/calc_tests4/tdf86253.py | 4
sc/qa/uitest/calc_tests4/tdf88999.py | 2
sc/qa/uitest/calc_tests4/tdf89907.py | 2
sc/qa/uitest/calc_tests4/tdf92423.py | 4
sc/qa/uitest/calc_tests4/textToColumns.py | 26 ++--
sc/qa/uitest/calc_tests4/trackedChanges.py | 4
sc/qa/uitest/calc_tests6/autoFormat.py | 4
sc/qa/uitest/calc_tests6/autocorrectOptions.py | 2
sc/qa/uitest/calc_tests6/hideShowSheet.py | 8 -
sc/qa/uitest/calc_tests6/moveCopySheet.py | 8 -
sc/qa/uitest/calc_tests6/scenarios.py | 4
sc/qa/uitest/calc_tests6/shareSpreadsheet.py | 2
sc/qa/uitest/calc_tests6/tdf104378.py | 2
sc/qa/uitest/calc_tests6/tdf107267.py | 2
sc/qa/uitest/calc_tests6/tdf116996.py | 4
sc/qa/uitest/calc_tests6/tdf118638.py | 2
sc/qa/uitest/calc_tests6/tdf121263.py | 6 -
sc/qa/uitest/calc_tests6/tdf91726.py | 2
sc/qa/uitest/calc_tests7/tdf106667.py | 2
sc/qa/uitest/calc_tests7/tdf122509.py | 2
sc/qa/uitest/calc_tests7/tdf123122.py | 4
sc/qa/uitest/calc_tests7/tdf124896.py | 2
sc/qa/uitest/calc_tests8/navigator.py | 2
sc/qa/uitest/calc_tests8/tdf114710.py | 2
sc/qa/uitest/calc_tests8/tdf118308.py | 2
sc/qa/uitest/calc_tests8/tdf125051.py | 2
sc/qa/uitest/calc_tests8/tdf126248.py | 4
sc/qa/uitest/calc_tests8/tdf137726.py | 2
sc/qa/uitest/calc_tests9/pivotTable.py | 2
sc/qa/uitest/calc_tests9/tdf121949.py | 2
sc/qa/uitest/calc_tests9/tdf126673.py | 4
sc/qa/uitest/calc_tests9/tdf130371.py | 6 -
sc/qa/uitest/calc_tests9/tdf133629.py | 4
sc/qa/uitest/calc_tests9/tdf137446.py | 4
sc/qa/uitest/calc_tests9/tdf141244.py | 2
sc/qa/uitest/chart/copyPaste.py | 2
sc/qa/uitest/chart/create_chart.py | 12 +-
sc/qa/uitest/chart/edit_chart.py | 2
sc/qa/uitest/chart/tdf101894.py | 4
sc/qa/uitest/chart/tdf124295.py | 2
sc/qa/uitest/chart/tdf131715.py | 2
sc/qa/uitest/chart/tdf43175.py | 2
sc/qa/uitest/chart/tdf46885.py | 4
sc/qa/uitest/chart/tdf62349.py | 2
sc/qa/uitest/chart/tdf99069.py | 2
sc/qa/uitest/conditional_format/tdf100793.py | 4
sc/qa/uitest/conditional_format/tdf104026.py | 2
sc/qa/uitest/conditional_format/tdf105544.py | 2
sc/qa/uitest/conditional_format/tdf117899.py | 4
sc/qa/uitest/conditional_format/tdf81696.py | 2
sc/qa/uitest/conditional_format/tdf96453.py | 2
sc/qa/uitest/csv_dialog/tdf142395.py | 2
sc/qa/uitest/csv_dialog/tdf57841.py | 2
sc/qa/uitest/csv_dialog/tdf60468.py | 2
sc/qa/uitest/key_f4/f4.py | 4
sc/qa/uitest/manual_tests/calc.py | 8 -
sc/qa/uitest/manual_tests/more_calc.py | 2
sc/qa/uitest/options/tdf122977.py | 2
sc/qa/uitest/pageFormat/tdf123508.py | 4
sc/qa/uitest/protect/protectSheet.py | 6 -
sc/qa/uitest/protect/protectSpreadsheet.py | 4
sc/qa/uitest/range_name/create_range_name.py | 10 -
sc/qa/uitest/range_name/tdf137617.py | 8 -
sc/qa/uitest/search_replace/tdf39917.py | 8 -
sc/qa/uitest/signatureLine/insertSignatureLine.py | 6 -
sc/qa/uitest/sort/naturalSort.py | 6 -
sc/qa/uitest/sort/sorting.py | 12 +-
sc/qa/uitest/sort/subtotals.py | 18 +--
sc/qa/uitest/sort/tdf100517.py | 2
sc/qa/uitest/sort/tdf105301.py | 2
sc/qa/uitest/sort/tdf126678.py | 2
sc/qa/uitest/sort/tdf49531.py | 2
sc/qa/uitest/sort/tdf53482.py | 4
sc/qa/uitest/sort/tdf54018.py | 2
sc/qa/uitest/sort/tdf57465.py | 2
sc/qa/uitest/sort/tdf91305.py | 4
sc/qa/uitest/sort/tdf95192.py | 2
sc/qa/uitest/sort/tdf99208.py | 2
sc/qa/uitest/sort/tdf99627.py | 2
sc/qa/uitest/sort/tdf99773.py | 2
sc/qa/uitest/validity/tdf137945.py | 2
sc/qa/uitest/validity/tdf138134.py | 2
sc/qa/uitest/validity/tdf53920.py | 8 -
sc/qa/uitest/validity/tdf65686.py | 4
sc/qa/uitest/validity/tdf96698.py | 16 +-
sc/qa/uitest/validity/validity.py | 12 +-
sd/qa/uitest/impress_tests/autocorrectOptions.py | 2
sd/qa/uitest/impress_tests/customSlideShow.py | 4
sd/qa/uitest/impress_tests/masterElements.py | 4
sd/qa/uitest/impress_tests/masterSlides.py | 2
sd/qa/uitest/impress_tests/renameSlide.py | 6 -
sd/qa/uitest/impress_tests/slideShowSettings.py | 4
sd/qa/uitest/impress_tests/tdf125449.py | 2
sd/qa/uitest/impress_tests/tdf134734.py | 6 -
sd/qa/uitest/impress_tests/tdf137729.py | 2
sd/qa/uitest/impress_tests/tdf139511.py | 2
sd/qa/uitest/impress_tests/tdf141297.py | 6 -
sd/qa/uitest/impress_tests/tdf91762.py | 2
sd/qa/uitest/impress_tests/textColumnsDialog.py | 4
sfx2/qa/uitest/doc/objserv.py | 2
svx/qa/uitest/table/tablecontroller.py | 4
sw/qa/uitest/chapterNumbering/chapterNumbering.py | 4
sw/qa/uitest/chapterNumbering/tdf123547.py | 2
sw/qa/uitest/chapterNumbering/tdf140528.py | 2
sw/qa/uitest/classification/classification.py | 10 -
sw/qa/uitest/findReplace/tdf118208.py | 4
sw/qa/uitest/macro_tests/tdf124413.py | 2
sw/qa/uitest/macro_tests/tdf64690.py | 2
sw/qa/uitest/navigator/tdf140257.py | 2
sw/qa/uitest/navigator/tdf40427.py | 2
sw/qa/uitest/options/optionsDialog.py | 4
sw/qa/uitest/options/tdf131581.py | 2
sw/qa/uitest/options/tdf78133.py | 4
sw/qa/uitest/sidebar/stylesSidebar.py | 2
sw/qa/uitest/sidebar/tdf133189.py | 2
sw/qa/uitest/sidebar/tdf135590.py | 4
sw/qa/uitest/styleInspector/styleInspector.py | 2
sw/qa/uitest/table/insertTableDialog.py | 6 -
sw/qa/uitest/table/splitTable.py | 6 -
sw/qa/uitest/table/tableProperties.py | 18 +--
sw/qa/uitest/table/tableToText.py | 8 -
sw/qa/uitest/table/tdf115026.py | 4
sw/qa/uitest/table/tdf116737.py | 4
sw/qa/uitest/table/tdf128593.py | 4
sw/qa/uitest/table/tdf134881_colProportionalAdjust.py | 2
sw/qa/uitest/table/tdf135693.py | 2
sw/qa/uitest/table/tdf81292.py | 2
sw/qa/uitest/table/tdf99334.py | 2
sw/qa/uitest/table/textToTable.py | 4
sw/qa/uitest/ui/fmtui/fmtui.py | 2
sw/qa/uitest/writer_tests/compareDocuments.py | 4
sw/qa/uitest/writer_tests/insertCaption.py | 8 -
sw/qa/uitest/writer_tests/tdf134734.py | 6 -
sw/qa/uitest/writer_tests/tdf53460.py | 4
sw/qa/uitest/writer_tests/tdf78068.py | 2
sw/qa/uitest/writer_tests/tdf81457.py | 2
sw/qa/uitest/writer_tests/tdf93068.py | 8 -
sw/qa/uitest/writer_tests/versionDialog.py | 2
sw/qa/uitest/writer_tests/watermark.py | 8 -
sw/qa/uitest/writer_tests2/bookmark.py | 22 ++--
sw/qa/uitest/writer_tests2/documentProperties.py | 4
sw/qa/uitest/writer_tests2/exchangeDatabase.py | 6 -
sw/qa/uitest/writer_tests2/fontworks.py | 2
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py | 32 ++---
sw/qa/uitest/writer_tests2/formatCharacter.py | 24 ++--
sw/qa/uitest/writer_tests2/formatParagraph.py | 54 +++++-----
sw/qa/uitest/writer_tests2/horizontalLine.py | 4
sw/qa/uitest/writer_tests2/pasteSpecial.py | 2
sw/qa/uitest/writer_tests2/tdf116474.py | 2
sw/qa/uitest/writer_tests3/autoredactDialog.py | 6 -
sw/qa/uitest/writer_tests3/customizeDialog.py | 10 -
sw/qa/uitest/writer_tests3/goToPage.py | 6 -
sw/qa/uitest/writer_tests3/hyperlinkdialog.py | 6 -
sw/qa/uitest/writer_tests3/insertEnvelope.py | 4
sw/qa/uitest/writer_tests3/insertFootEndnote.py | 10 -
sw/qa/uitest/writer_tests3/insertPageFooter.py | 4
sw/qa/uitest/writer_tests3/insertQrCodeGen.py | 6 -
sw/qa/uitest/writer_tests3/insertSignatureLine.py | 6 -
sw/qa/uitest/writer_tests3/lineNumbering.py | 6 -
sw/qa/uitest/writer_tests3/pageDialog.py | 14 +-
sw/qa/uitest/writer_tests3/sort.py | 4
sw/qa/uitest/writer_tests3/specialCharacter.py | 4
sw/qa/uitest/writer_tests3/tdf79236.py | 4
sw/qa/uitest/writer_tests4/insertBreakDialog.py | 8 -
sw/qa/uitest/writer_tests4/insertPageHeader.py | 4
sw/qa/uitest/writer_tests4/tdf113252.py | 2
sw/qa/uitest/writer_tests4/tdf113284.py | 4
sw/qa/uitest/writer_tests4/tdf115572.py | 8 -
sw/qa/uitest/writer_tests4/tdf115573.py | 16 +-
sw/qa/uitest/writer_tests4/tdf122449.py | 4
sw/qa/uitest/writer_tests4/tdf138546.py | 4
sw/qa/uitest/writer_tests4/tdf51352.py | 6 -
sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py | 12 +-
sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py | 14 +-
sw/qa/uitest/writer_tests5/about_test.py | 2
sw/qa/uitest/writer_tests5/autocorrectOptions.py | 2
sw/qa/uitest/writer_tests5/columns.py | 4
sw/qa/uitest/writer_tests5/tdf107494.py | 4
sw/qa/uitest/writer_tests5/tdf118540.py | 2
sw/qa/uitest/writer_tests5/tdf122045.py | 2
sw/qa/uitest/writer_tests5/tdf122722.py | 4
sw/qa/uitest/writer_tests5/tdf123446.py | 2
sw/qa/uitest/writer_tests5/titlePage.py | 4
sw/qa/uitest/writer_tests5/titlePageWizard.py | 10 -
sw/qa/uitest/writer_tests5/titlePageWizard2.py | 6 -
sw/qa/uitest/writer_tests5/zoom.py | 12 +-
sw/qa/uitest/writer_tests6/tdf107847.py | 2
sw/qa/uitest/writer_tests6/tdf120731.py | 2
sw/qa/uitest/writer_tests6/tdf124586.py | 4
sw/qa/uitest/writer_tests6/tdf125104.py | 8 -
sw/qa/uitest/writer_tests6/tdf126017.py | 4
sw/qa/uitest/writer_tests6/tdf126168.py | 4
sw/qa/uitest/writer_tests6/tdf126226.py | 2
sw/qa/uitest/writer_tests6/tdf128431.py | 2
sw/qa/uitest/writer_tests6/tdf131041.py | 2
sw/qa/uitest/writer_tests7/apply_line_cap.py | 6 -
sw/qa/uitest/writer_tests7/tdf104795.py | 2
sw/qa/uitest/writer_tests7/tdf109083.py | 4
sw/qa/uitest/writer_tests7/tdf115853.py | 2
sw/qa/uitest/writer_tests7/tdf119661.py | 6 -
sw/qa/uitest/writer_tests7/tdf122780.py | 2
sw/qa/uitest/writer_tests7/tdf131936.py | 2
sw/qa/uitest/writer_tests7/tdf132169.py | 2
sw/qa/uitest/writer_tests7/tdf133348.py | 2
sw/qa/uitest/writer_tests7/tdf134243.py | 2
sw/qa/uitest/writer_tests7/tdf137802.py | 2
sw/qa/uitest/writer_tests7/tdf137803.py | 2
sw/qa/uitest/writer_tests7/tdf139301.py | 4
sw/qa/uitest/writer_tests7/tdf140117.py | 2
sw/qa/uitest/writer_tests7/tdf140863.py | 6 -
sw/qa/uitest/writer_tests7/tdf141557.py | 2
sw/qa/uitest/writer_tests7/tdf46561.py | 2
sw/qa/uitest/writer_tests7/tdf90401.py | 4
uitest/demo_ui/char_dialog.py | 2
uitest/demo_ui/checkbox.py | 2
uitest/demo_ui/hierarchy.py | 2
uitest/demo_ui/listbox.py | 4
uitest/demo_ui/radiobutton.py | 2
uitest/demo_ui/spinfield.py | 6 -
uitest/demo_ui/tabdialog.py | 4
uitest/impress_tests/backgrounds.py | 4
uitest/impress_tests/drawinglayer.py | 6 -
uitest/uitest/test.py | 22 +---
uitest/uitest/uihelper/common.py | 2
uitest/uitest/uihelper/testDialog.py | 4
266 files changed, 673 insertions(+), 677 deletions(-)
New commits:
commit 5b8a13486d3809066e663549879c209992d5479d
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Tue Jun 29 11:44:54 2021 +0200
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 29 15:10:03 2021 +0200
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 at libreoffice.org>
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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list