[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |    2 +-
 vcl/qt5/Qt5Menu.cxx     |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 2c84ef99bf663b963348f4d292f733b74f144269
Author:     Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Thu Jan 10 15:54:56 2019 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jan 18 15:57:01 2019 +0100

    tdf#122253 KDE5: Correct parent menu before it's used
    
    Also correct action group of menu
    
    Change-Id: Ie7eddd3cdc9fa1c36fdeaa1e96eb5d50d7126c09
    Reviewed-on: https://gerrit.libreoffice.org/66146
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit c278857137ea0e9e25613d5f6bf8ddaf1336fbcc)
    Reviewed-on: https://gerrit.libreoffice.org/66173
    Reviewed-by: Aleksei Nikiforov <darktemplar at basealt.ru>
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit b6704c14ce2241e76904e494125a520814ec5021)
    Reviewed-on: https://gerrit.libreoffice.org/66613
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 9f7469fa3f78..b3b06bfeabac 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -33,7 +33,7 @@ private:
     QMenu* mpQMenu;
     QActionGroup* mpQActionGroup;
 
-    void DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu = nullptr);
+    void DoFullMenuUpdate(Menu* pMenuBar);
     static void NativeItemText(OUString& rItemText);
 
     QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos);
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 7650eb034a1d..dd6c216b8be8 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -218,18 +218,17 @@ void Qt5Menu::SetFrame(const SalFrame* pFrame)
     if (pMainWindow)
     {
         mpQMenuBar = pMainWindow->menuBar();
+        mpQMenu = nullptr;
+        mpQActionGroup = nullptr;
 
         DoFullMenuUpdate(mpVCLMenu);
     }
 }
 
-void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu)
+void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar)
 {
-    mpQMenu = pParentMenu;
-
     if (mbMenuBar && mpQMenuBar)
         mpQMenuBar->clear();
-    mpQActionGroup = nullptr;
 
     for (sal_Int32 nItem = 0; nItem < static_cast<sal_Int32>(GetItemCount()); nItem++)
     {
@@ -239,8 +238,12 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu)
 
         if (pSalMenuItem->mpSubMenu != nullptr)
         {
+            // correct parent menu and action group before calling HandleMenuActivateEvent
+            pSalMenuItem->mpSubMenu->mpQMenu = pQMenu;
+            pSalMenuItem->mpSubMenu->mpQActionGroup = nullptr;
+
             pMenuBar->HandleMenuActivateEvent(pSalMenuItem->mpSubMenu->GetMenu());
-            pSalMenuItem->mpSubMenu->DoFullMenuUpdate(pMenuBar, pQMenu);
+            pSalMenuItem->mpSubMenu->DoFullMenuUpdate(pMenuBar);
             pMenuBar->HandleMenuDeActivateEvent(pSalMenuItem->mpSubMenu->GetMenu());
         }
     }