Kaydet (Commit) 0d21a5ed authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Andras Timar

tdf#92262 - fixup shared_ptr -> VclPtr issue.

Change-Id: Ia0b22e62001cff4a63ea197b77aebb1759f73122
Reviewed-on: https://gerrit.libreoffice.org/16664Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16684Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3830a17e
...@@ -100,6 +100,8 @@ ScMenuFloatingWindow::~ScMenuFloatingWindow() ...@@ -100,6 +100,8 @@ ScMenuFloatingWindow::~ScMenuFloatingWindow()
void ScMenuFloatingWindow::dispose() void ScMenuFloatingWindow::dispose()
{ {
EndPopupMode(); EndPopupMode();
for (auto i = maMenuItems.begin(); i != maMenuItems.end(); ++i)
i->mpSubMenuWin.disposeAndClear();
mpParentMenu.clear(); mpParentMenu.clear();
PopupMenuFloatingWindow::dispose(); PopupMenuFloatingWindow::dispose();
} }
...@@ -919,6 +921,7 @@ void ScCheckListMenuWindow::dispose() ...@@ -919,6 +921,7 @@ void ScCheckListMenuWindow::dispose()
maBtnUnselectSingle.disposeAndClear(); maBtnUnselectSingle.disposeAndClear();
maBtnOk.disposeAndClear(); maBtnOk.disposeAndClear();
maBtnCancel.disposeAndClear(); maBtnCancel.disposeAndClear();
maTabStopCtrls.clear();
ScMenuFloatingWindow::dispose(); ScMenuFloatingWindow::dispose();
} }
......
...@@ -147,8 +147,8 @@ private: ...@@ -147,8 +147,8 @@ private:
struct MenuItemData struct MenuItemData
{ {
OUString maText; OUString maText;
bool mbEnabled:1; bool mbEnabled:1;
bool mbSeparator:1; bool mbSeparator:1;
::boost::shared_ptr<Action> mpAction; ::boost::shared_ptr<Action> mpAction;
VclPtr<ScMenuFloatingWindow> mpSubMenuWin; VclPtr<ScMenuFloatingWindow> mpSubMenuWin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment