diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-18 20:52:16 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-11-30 18:21:40 +0100 |
| commit | 7364cbbdea110d3c7b1656290b4c0a746a95cfe4 (patch) | |
| tree | e4a4221dabfa2ffec905cdd68bc0dc8cd2a6cf1a /sc | |
| parent | 0b95ba1c9335e247a2e2ff946d36f98338aab1b1 (diff) | |
tdf#136559 We can get a performance boost from using a ListStore
instead of a TreeStore if we only need a list
see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2693
Change-Id: I03d03f2364ccc75b87d3f7c31d21ac9993fb384b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103036
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106878
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/uitest/autofilter/autofilter.py | 2 | ||||
| -rw-r--r-- | sc/qa/uitest/autofilter/autofilterBugs.py | 2 | ||||
| -rw-r--r-- | sc/qa/uitest/autofilter/tdf97340.py | 9 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py index e1aea9c1e303..47b94a6807bc 100644 --- a/sc/qa/uitest/autofilter/autofilter.py +++ b/sc/qa/uitest/autofilter/autofilter.py @@ -33,7 +33,7 @@ class AutofilterTest(UITestCase): xFloatWindow = self.xUITest.getFloatWindow() xCheckListMenu = xFloatWindow.getChild("check_list_menu") - xTreeList = xCheckListMenu.getChild("check_list_box") + xTreeList = xCheckListMenu.getChild("check_tree_box") xFirstEntry = xTreeList.getChild("0") xFirstEntry.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py b/sc/qa/uitest/autofilter/autofilterBugs.py index e216d7994d8c..460d4d86d19d 100644 --- a/sc/qa/uitest/autofilter/autofilterBugs.py +++ b/sc/qa/uitest/autofilter/autofilterBugs.py @@ -138,7 +138,7 @@ class autofilter(UITestCase): xGridWindow.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"})) xFloatWindow = self.xUITest.getFloatWindow() - xTreeList = xFloatWindow.getChild("check_list_box") + xTreeList = xFloatWindow.getChild("check_tree_box") xFirstEntry = xTreeList.getChild("0") self.assertEqual(get_state_as_dict(xFirstEntry)["Text"], "2014") diff --git a/sc/qa/uitest/autofilter/tdf97340.py b/sc/qa/uitest/autofilter/tdf97340.py index 237ed71178ba..272883f1829d 100644 --- a/sc/qa/uitest/autofilter/tdf97340.py +++ b/sc/qa/uitest/autofilter/tdf97340.py @@ -30,9 +30,16 @@ class tdf97340(UITestCase): gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"})) xFloatWindow = self.xUITest.getFloatWindow() + + xCheckListMenu = xFloatWindow.getChild("check_list_menu") + xTreeList = xCheckListMenu.getChild("check_tree_box") + self.assertEqual(2, len(xTreeList.getChildren())) + self.assertEqual("2016", get_state_as_dict(xTreeList.getChild('0'))['Text']) + self.assertEqual("2017", get_state_as_dict(xTreeList.getChild('1'))['Text']) + xsearchEdit = xFloatWindow.getChild("search_edit") xsearchEdit.executeAction("TYPE", mkPropertyValues({"TEXT":" "})) xsearchEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "BACKSPACE"})) 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: diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 8c9317f9d5ab..b905d5a7bba1 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -416,7 +416,7 @@ ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v ScDocument* pDoc, bool bCanHaveSubMenu, bool bHasDates, int nWidth) : mxFrame(pParent) - , mxBuilder(Application::CreateInterimBuilder(pContainer, "modules/scalc/ui/filterdropdown.ui", false)) + , mxBuilder(Application::CreateInterimBuilder(pContainer, "modules/scalc/ui/filterdropdown.ui")) , mxContainer(mxBuilder->weld_container("FilterDropDown")) , mxMenu(mxBuilder->weld_tree_view("menu")) , mxScratchIter(mxMenu->make_iterator()) @@ -424,6 +424,7 @@ ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v , mxBox(mxBuilder->weld_widget("box")) , mxListChecks(mxBuilder->weld_tree_view("check_list_box")) , mxTreeChecks(mxBuilder->weld_tree_view("check_tree_box")) + , mpChecks(mxTreeChecks.get()) , mxChkToggleAll(mxBuilder->weld_check_button("toggle_all")) , mxBtnSelectSingle(mxBuilder->weld_button("select_current")) , mxBtnUnselectSingle(mxBuilder->weld_button("unselect_current")) |