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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ef696ff1594a2e3c6ef2185b27c8e67f6592b33
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 18 09:19:46 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 18 17:37:18 2021 +0100

    when color menu popdowns only popdown the autofilter if something was 
selected
    
    so the color menu can be dismissed without dismissing the autofilter
    
    Change-Id: Idb44f40a599382f86ffa9519910c37e64a56820c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125439
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 33ea3fe045b8..5b203addbb12 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -978,11 +978,12 @@ void 
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
 
                 sal_Int32 nSelected = rControl.ExecuteMenu(*xColorMenu);
                 xColorMenu.reset();
-                rControl.terminateAllPopupMenus();
 
                 if (nSelected == 0)
                     return;
 
+                rControl.terminateAllPopupMenus();
+
                 // Disable color filter when active color was selected
                 if (nSelected == nActive)
                 {