mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
This commit is contained in:
Caolán McNamara
2015-05-26 17:33:52 +01:00
parent 2efb9d3c98
commit 2a6aa95a7a
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/sidebar/Popup.hxx
View File

@@ -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;

1
svx/source/sidebar/line/LinePropertyPanel.cxx
View File

@@ -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();

7
svx/source/sidebar/tools/Popup.cxx
View File

@@ -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);