summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-13 11:19:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-15 16:24:49 +0200
commitbcaeebd98a697d6bcf891990c3b13de5da1790e7 (patch)
treebec2ffd6f4d4cb17dd427966f8bdd8564d9a33c0
parent183206ee091c589a93b90a6a24cc4bdbe2d01062 (diff)
Related: tdf#125531 use RemoveTabPage for removing a tab page
which removes the tab cross-platform Change-Id: If2584cc75350fb0106f1a1f5190abb74b0ee0ccf Reviewed-on: https://gerrit.libreoffice.org/78871 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/qa/uitest/calc_tests/documentProperties.py6
-rw-r--r--sd/qa/uitest/impress_tests/documentProperties.py4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx8
-rw-r--r--sw/qa/uitest/writer_tests2/documentProperties.py8
4 files changed, 13 insertions, 13 deletions
diff --git a/sc/qa/uitest/calc_tests/documentProperties.py b/sc/qa/uitest/calc_tests/documentProperties.py
index 3f0f0cbf611b..71030b595959 100644
--- a/sc/qa/uitest/calc_tests/documentProperties.py
+++ b/sc/qa/uitest/calc_tests/documentProperties.py
@@ -48,12 +48,12 @@ class CalcDocumentProperties(UITestCase):
xCommentsText.executeAction("TYPE", mkPropertyValues({"TEXT":"Comments text"}))
#Font tab
- select_pos(xTabs, "5") #tab Fonts
+ select_pos(xTabs, "4") #tab Fonts
xFontEmbedCheckbox = xDialog.getChild("embedFonts")
xFontEmbedCheckbox.executeAction("CLICK", tuple())
#Security tab
- select_pos(xTabs, "4") #tab Security
+ select_pos(xTabs, "3") #tab Security
xReadOnlyCheckbox = xDialog.getChild("readonly")
xReadOnlyCheckbox.executeAction("CLICK", tuple())
xRecordChangesCheckbox = xDialog.getChild("recordchanges")
@@ -74,7 +74,7 @@ class CalcDocumentProperties(UITestCase):
xAddBtn = xDialog.getChild("add")
xAddBtn.executeAction("CLICK", tuple())
- select_pos(xTabs, "6") #tab Statistics
+ select_pos(xTabs, "5") #tab Statistics
xOkBtn = xDialog.getChild("ok")
xOkBtn.executeAction("CLICK", tuple())
diff --git a/sd/qa/uitest/impress_tests/documentProperties.py b/sd/qa/uitest/impress_tests/documentProperties.py
index e74ba0fd26c6..54ad2947b6bf 100644
--- a/sd/qa/uitest/impress_tests/documentProperties.py
+++ b/sd/qa/uitest/impress_tests/documentProperties.py
@@ -52,12 +52,12 @@ class ImpressDocumentProperties(UITestCase):
xCommentsText.executeAction("TYPE", mkPropertyValues({"TEXT":"Comments text"}))
#Font tab
- select_pos(xTabs, "5") #tab Fonts
+ select_pos(xTabs, "4") #tab Fonts
xFontEmbedCheckbox = xDialog.getChild("embedFonts")
xFontEmbedCheckbox.executeAction("CLICK", tuple())
#Security tab
- select_pos(xTabs, "4") #tab Security
+ select_pos(xTabs, "3") #tab Security
xReadOnlyCheckbox = xDialog.getChild("readonly")
xReadOnlyCheckbox.executeAction("CLICK", tuple())
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2b49b18bfc3b..782d4faa0b2e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1127,13 +1127,13 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog(weld::Window* pParent, const SfxIte
AddTabPage("general", SfxDocumentPage::Create, nullptr);
AddTabPage("description", SfxDocumentDescPage::Create, nullptr);
AddTabPage("customprops", SfxCustomPropertiesPage::Create, nullptr);
- AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, nullptr);
- if (!rInfoItem.isCmisDocument())
- m_xTabCtrl->get_page("cmisprops")->hide();
+ if (rInfoItem.isCmisDocument())
+ AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, nullptr);
+ else
+ RemoveTabPage("cmisprops");
AddTabPage("security", SfxSecurityPage::Create, nullptr);
}
-
void SfxDocumentInfoDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{
if (rId == "general")
diff --git a/sw/qa/uitest/writer_tests2/documentProperties.py b/sw/qa/uitest/writer_tests2/documentProperties.py
index 0230decef350..40366d2303b5 100644
--- a/sw/qa/uitest/writer_tests2/documentProperties.py
+++ b/sw/qa/uitest/writer_tests2/documentProperties.py
@@ -53,12 +53,12 @@ class documentProperties(UITestCase):
#Font tab
- select_pos(xTabs, "5") #tab Fonts
+ select_pos(xTabs, "4") #tab Fonts
xFontEmbedCheckbox = xDialog.getChild("embedFonts")
xFontEmbedCheckbox.executeAction("CLICK", tuple())
#Security tab
- select_pos(xTabs, "4") #tab Security
+ select_pos(xTabs, "3") #tab Security
xReadOnlyCheckbox = xDialog.getChild("readonly")
xReadOnlyCheckbox.executeAction("CLICK", tuple())
xRecordChangesCheckbox = xDialog.getChild("recordchanges")
@@ -80,7 +80,7 @@ class documentProperties(UITestCase):
xAddBtn = xDialog.getChild("add")
xAddBtn.executeAction("CLICK", tuple())
- select_pos(xTabs, "6") #tab Statistics
+ select_pos(xTabs, "5") #tab Statistics
xUpdateBtn = xDialog.getChild("update")
xUpdateBtn.executeAction("CLICK", tuple())
@@ -115,4 +115,4 @@ class documentProperties(UITestCase):
self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab: \ No newline at end of file
+# vim: set shiftwidth=4 softtabstop=4 expandtab: