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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Menu.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 3ad592febc5acd97a275527198ba10f07f4f4905
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:18 2019 +0100

    Unregister action when menu item is removed
    
    Change-Id: I9fc5e6630560f285eeb7ef4dbc5e39ccabd5f0df
    Reviewed-on: https://gerrit.libreoffice.org/66147
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 35b59e56cc01e5ecf97583ab7b7884d301457089)
    Reviewed-on: https://gerrit.libreoffice.org/66172
    Reviewed-by: Aleksei Nikiforov <darktemplar at basealt.ru>
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 9ddf669ee1a4490cfbfe0d7166ce7effcc717074)
    Reviewed-on: https://gerrit.libreoffice.org/66614
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index dd6c216b8be8..51efdeb19ffe 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -184,7 +184,15 @@ void Qt5Menu::InsertItem(SalMenuItem* pSalMenuItem, unsigned nPos)
 void Qt5Menu::RemoveItem(unsigned nPos)
 {
     SolarMutexGuard aGuard;
-    maItems.erase(maItems.begin() + nPos);
+
+    if (nPos < maItems.size())
+    {
+        Qt5MenuItem* pItem = maItems[nPos];
+        pItem->mpAction.reset();
+        pItem->mpMenu.reset();
+
+        maItems.erase(maItems.begin() + nPos);
+    }
 }
 
 void Qt5Menu::SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned)