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

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Tue Jul 16 22:37:24 UTC 2019


 sc/source/ui/view/gridwin.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5f48428533e928868c11ddd00cc449a54d0cdfd9
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Tue Jul 9 15:35:03 2019 +0200
Commit:     Xisco FaulĂ­ <xiscofauli at libreoffice.org>
CommitDate: Wed Jul 17 00:36:43 2019 +0200

    tdf#126306: ignore Top10, Empty and NonEmpty in fix for tdf#117276
    
    Regression from 4e7e3670c31329d60f5cc782abc4568c2aba33a7
    
    Change-Id: I034f4f087580aa7c54b92909736af712047251a6
    Reviewed-on: https://gerrit.libreoffice.org/75304
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 9bd7e2cdf7d2b247ae99a2ce71449d9f265032d1)
    Reviewed-on: https://gerrit.libreoffice.org/75732

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 178db0157efb..1d573e977c50 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -805,9 +805,11 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
         pViewData->GetDispatcher().Execute(SID_FILTER, SfxCallMode::SLOT|SfxCallMode::RECORD);
         return;
     }
-
-    // do not recreate auto-filter rules if there is no any changes from the user
+    if (eMode != AutoFilterMode::Top10
+            && eMode != AutoFilterMode::Empty
+            && eMode != AutoFilterMode::NonEmpty)
     {
+        // do not recreate auto-filter rules if there is no any changes from the user
         ScCheckListMenuWindow::ResultType aResult;
         mpAutoFilterPopup->getResult(aResult);
 


More information about the Libreoffice-commits mailing list