summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/tools/Popup.cxx7
2 files changed, 7 insertions, 1 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 589247e35ee4..e7348a9c19c0 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -213,6 +213,7 @@ void LinePropertyPanel::dispose()
mpFTCapStyle.clear();
mpLBCapStyle.clear();
+ maLineWidthPopup.dispose();
maStyleControl.dispose();
maDashControl.dispose();
maWidthControl.dispose();
diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx
index 71911a51ae72..3bd6246a5fcf 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -40,12 +40,17 @@ Popup::Popup (
OSL_ASSERT(maControlCreator);
}
-Popup::~Popup()
+void Popup::dispose()
{
mxControl.disposeAndClear();
mxContainer.disposeAndClear();
}
+Popup::~Popup()
+{
+ dispose();
+}
+
void Popup::Show (ToolBox& rToolBox)
{
rToolBox.SetItemDown(rToolBox.GetCurItemId(), true);