tdf#97527 - vcl: reference-count Menu

some places are marked with "dodgy"- need to check those to see
what is going on, because they are leaving dangling pointers behind
in the Menu class

Change-Id: I41d5c7c0fec2f70ce9e3ffdc48cd03d26c0a869b
Reviewed-on: https://gerrit.libreoffice.org/26516
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index a1c1fa2d410d..954615aeb82c 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -36,9 +36,8 @@ MenuItemData::~MenuItemData()
         aUserValueReleaseFunc(nUserValue);
     if( pAutoSubMenu )
     {
-        static_cast<PopupMenu*>(pAutoSubMenu)->pRefAutoSubMenu = nullptr;
-        delete pAutoSubMenu;
-        pAutoSubMenu = nullptr;
+        static_cast<PopupMenu*>(pAutoSubMenu.get())->pRefAutoSubMenu = nullptr;
+        pAutoSubMenu.disposeAndClear();
     }
     if( pSalMenuItem )
         ImplGetSVData()->mpDefInst->DestroyMenuItem( pSalMenuItem );