summaryrefslogtreecommitdiff
path: root/sc/source/ui/cctrl/checklistmenu.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-07-01 17:46:05 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-07-01 19:01:27 +0000
commitbee5421dc6aa60ef1d07f647286c8fbf9ff8d2d7 (patch)
treee0eaeef7d9d6ae0ea0037b2615e7e927559c0115 /sc/source/ui/cctrl/checklistmenu.cxx
parentff81cb4728c04acf6dfe639c3140b26d68a70751 (diff)
tdf#92262 - fixup shared_ptr -> VclPtr issue.
Change-Id: Ia0b22e62001cff4a63ea197b77aebb1759f73122 Reviewed-on: https://gerrit.libreoffice.org/16664 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sc/source/ui/cctrl/checklistmenu.cxx')
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index bbbed3332cb8..b4dc71b3ac1f 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();
}