summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Francis <dennisfrancis.in@gmail.com>2015-09-18 15:18:49 +0530
committerCaolán McNamara <caolanm@redhat.com>2015-09-18 11:52:24 +0000
commitec76524221c146635e0046f567ddd31e1e28be3c (patch)
tree946fbdf8a2bbdc8f94dd10e4264ad274e02281c8
parent637ad743bb74a826ddd4db5efbcd33779b9132cd (diff)
fixes memleak : release references to TextPropertyPanel
Clear the references to TextPropertyPanel (parent vcl::Window) held in maCharSpacePopup and maUnderlinePopup (both are instances derived from svx::sidebar::Popup class) via Popup::dispose() Change-Id: Iff0c55a851d2d0ef027c356b3829b0095bc2aacb Reviewed-on: https://gerrit.libreoffice.org/18682 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx3
-rw-r--r--svx/source/sidebar/tools/Popup.cxx1
2 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 416a2e3e745c..3ba3dd7b0cef 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -131,6 +131,9 @@ void TextPropertyPanel::dispose()
maUnderlineControl.dispose();
maSpacingControl.dispose();
+ maCharSpacePopup.dispose();
+ maUnderlinePopup.dispose();
+
PanelLayout::dispose();
}
diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx
index 98064ee328d9..ba03dd5335b1 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -44,6 +44,7 @@ void Popup::dispose()
{
mxControl.disposeAndClear();
mxContainer.disposeAndClear();
+ mpParent.clear();
}
Popup::~Popup()