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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 6aade14148e3d56706b074392ca3569b2a2a8376
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 3 09:41:12 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Sep 3 15:03:08 2019 +0200

    Resolves: tdf#127168 dismiss menu before executing sort
    
    so any error dialog which are parented to the calc window are not
    hidden by the menu which is destined to be dismissed after the
    sort anyway
    
    Change-Id: I7c49737231901de0e61c290fe161d37809d68424
    Reviewed-on: https://gerrit.libreoffice.org/78540
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 43553d305f38..413cf36704c0 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -452,8 +452,9 @@ void ScMenuFloatingWindow::executeMenuItem(size_t nPos)
         // no action is defined.
         return;
 
-    maMenuItems[nPos].mpAction->execute();
     terminateAllPopupMenus();
+
+    maMenuItems[nPos].mpAction->execute();
 }
 
 void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu)