[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |    6 ++++--
 sc/source/ui/inc/checklistmenu.hxx   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1f2e111caa13d6f2c7595ed1c6831742450441ec
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 29 15:10:08 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Thu Jun 11 20:08:41 2020 +0200

    fix tree disabled in autofilter pulldown, tdf#76481 related
    
    regression from
        commit f71557e958a8a626dfc1eef646b84b3c8b72569a
        Date:   Thu May 21 15:05:08 2020 +0200
        tdf#76481 speed up searching in autofilter pulldown
    
    Change-Id: Iac7fba87e12ae68a040706694ef94655113a6491
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95142
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit b81432a23c900329ece07854fd06a322225a97c1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96173
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 664b63444748..0ddd31748958 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl, Edit&, void)
     {
         // when there are a lot of rows, it is cheaper to simply clear the tree and re-initialise
         maChecks->Clear();
-        initMembers();
+        nSelCount = initMembers();
     }
     else
     {
@@ -1888,11 +1888,12 @@ void ScCheckListMenuWindow::setHasDates(bool bHasDates)
         maChecks->SetStyle(WB_HASBUTTONS);
 }
 
-void ScCheckListMenuWindow::initMembers()
+size_t ScCheckListMenuWindow::initMembers()
 {
     size_t n = maMembers.size();
     size_t nVisMemCount = 0;
 
+
     maChecks->SetUpdateMode(false);
     maChecks->GetModel()->EnableInvalidate(false);
 
@@ -1944,6 +1945,7 @@ void ScCheckListMenuWindow::initMembers()
 
     maChecks->GetModel()->EnableInvalidate(true);
     maChecks->SetUpdateMode(true);
+    return nVisMemCount;
 }
 
 void ScCheckListMenuWindow::setConfig(const Config& rConfig)
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 2ff574a15252..f9affb88f096 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -348,7 +348,7 @@ public:
     void setHasDates(bool bHasDates);
     void addDateMember(const OUString& rName, double nVal, bool bVisible);
     void addMember(const OUString& rName, bool bVisible);
-    void initMembers();
+    size_t initMembers();
     void setConfig(const Config& rConfig);
 
     bool isAllSelected() const;