[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Michael Meeks]

 sc/source/ui/cctrl/checklistmenu.cxx |    3 +++
 sc/source/ui/inc/checklistmenu.hxx   |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 50b93a183bcdd9981a740a92cd5cc6be77be1973
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Jul 1 17:46:05 2015 +0100

    tdf#92262 - fixup shared_ptr -> VclPtr issue.
    
    Change-Id: Ia0b22e62001cff4a63ea197b77aebb1759f73122
    Reviewed-on: https://gerrit.libreoffice.org/16664
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/16684
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index bbbed33..b4dc71b 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -100,6 +100,8 @@ ScMenuFloatingWindow::~ScMenuFloatingWindow()
 void ScMenuFloatingWindow::dispose()
 {
     EndPopupMode();
+    for (auto i = maMenuItems.begin(); i != maMenuItems.end(); ++i)
+        i->mpSubMenuWin.disposeAndClear();
     mpParentMenu.clear();
     PopupMenuFloatingWindow::dispose();
 }
@@ -919,6 +921,7 @@ void ScCheckListMenuWindow::dispose()
     maBtnUnselectSingle.disposeAndClear();
     maBtnOk.disposeAndClear();
     maBtnCancel.disposeAndClear();
+    maTabStopCtrls.clear();
     ScMenuFloatingWindow::dispose();
 }
 
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 26732c9..f4e714a 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -147,8 +147,8 @@ private:
     struct MenuItemData
     {
         OUString maText;
-        bool            mbEnabled:1;
-        bool            mbSeparator:1;
+        bool     mbEnabled:1;
+        bool     mbSeparator:1;
 
         ::boost::shared_ptr<Action> mpAction;
         VclPtr<ScMenuFloatingWindow> mpSubMenuWin;