[Libreoffice-commits] core.git: 2 commits - sc/source uitest/calc_tests

[Markus Mohrhard]

 sc/source/ui/uitest/uiobject.cxx |    4 +++-
 uitest/calc_tests/gridwin.py     |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit ab26cddc3325a6422993a3421a557536d6023936
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 7 01:36:12 2018 +0100

    uitest: add demo showing how to select different sheet
    
    Change-Id: I1ddc8e9855832df7176d768e73d062e7f601a62c
    Reviewed-on: https://gerrit.libreoffice.org/50854
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 1afbe8142f54..7c9c87de0b03 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -6,6 +6,7 @@
 #
 
 from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
 
 from uitest.framework import UITestCase
 
@@ -28,4 +29,20 @@ class GridWinTest(UITestCase):
 
         self.ui_test.close_doc()
 
+    def test_select_sheet(self):
+
+        self.ui_test.create_doc_in_start_center("calc")
+        xCalcDoc = self.xUITest.getTopFocusWindow()
+        xGridWindow = xCalcDoc.getChild("grid_window")
+
+        for i in range(3):
+            self.ui_test.execute_dialog_through_command(".uno:Insert")
+            current_dialog = self.xUITest.getTopFocusWindow()
+
+            xOkButton = current_dialog.getChild("ok")
+            self.ui_test.close_dialog_through_button(xOkButton)
+
+        xGridWindow.executeAction("SELECT", mkPropertyValues({"TABLE": "2"}))
+        self.assertEqual(get_state_as_dict(xGridWindow)["SelectedTable"], "2")
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
commit 455fe33df4d498d8c374d43f57caf14897636749
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 7 01:33:25 2018 +0100

    uitest: fix small bug when trying to select different sheet in calc
    
    Change-Id: I83e2b8dc1b0da9f28475994493e3776c898a5729
    Reviewed-on: https://gerrit.libreoffice.org/50853
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx
index 323ae82e517a..3e98e1535bfc 100644
--- a/sc/source/ui/uitest/uiobject.cxx
+++ b/sc/source/ui/uitest/uiobject.cxx
@@ -131,7 +131,9 @@ void ScGridWinUIObject::execute(const OUString& rAction,
             auto itr = rParameters.find("TABLE");
             const OUString rStr = itr->second;
             sal_Int32 nTab = rStr.toUInt32();
-            mxGridWindow->getViewData()->SetTabNo(nTab);
+            ScTabView* pTabView = mxGridWindow->getViewData()->GetView();
+            if (pTabView)
+                pTabView->SetTabNo(nTab);
         }
         else if (rParameters.find("OBJECT") != rParameters.end())
         {