diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-07-01 17:46:05 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-07-01 19:01:27 +0000 |
| commit | bee5421dc6aa60ef1d07f647286c8fbf9ff8d2d7 (patch) | |
| tree | e0eaeef7d9d6ae0ea0037b2615e7e927559c0115 | |
| parent | ff81cb4728c04acf6dfe639c3140b26d68a70751 (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>
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 4 |
2 files changed, 5 insertions, 2 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(); } diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 26732c90c3d9..f4e714a5f220 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; |