Kaydet (Commit) de2d7448 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#91542 crash on pressing return in sidebar line popup

Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
(cherry picked from commit 2a6aa95a)
üst 0d4d89b6
...@@ -75,6 +75,8 @@ public : ...@@ -75,6 +75,8 @@ public :
*/ */
void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback); void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
void dispose();
protected: protected:
VclPtr<PopupControl> mxControl; VclPtr<PopupControl> mxControl;
......
...@@ -213,6 +213,7 @@ void LinePropertyPanel::dispose() ...@@ -213,6 +213,7 @@ void LinePropertyPanel::dispose()
mpFTCapStyle.clear(); mpFTCapStyle.clear();
mpLBCapStyle.clear(); mpLBCapStyle.clear();
maLineWidthPopup.dispose();
maStyleControl.dispose(); maStyleControl.dispose();
maDashControl.dispose(); maDashControl.dispose();
maWidthControl.dispose(); maWidthControl.dispose();
......
...@@ -40,12 +40,17 @@ Popup::Popup ( ...@@ -40,12 +40,17 @@ Popup::Popup (
OSL_ASSERT(maControlCreator); OSL_ASSERT(maControlCreator);
} }
Popup::~Popup() void Popup::dispose()
{ {
mxControl.disposeAndClear(); mxControl.disposeAndClear();
mxContainer.disposeAndClear(); mxContainer.disposeAndClear();
} }
Popup::~Popup()
{
dispose();
}
void Popup::Show (ToolBox& rToolBox) void Popup::Show (ToolBox& rToolBox)
{ {
rToolBox.SetItemDown(rToolBox.GetCurItemId(), true); rToolBox.SetItemDown(rToolBox.GetCurItemId(), true);
......
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