From ec76524221c146635e0046f567ddd31e1e28be3c Mon Sep 17 00:00:00 2001 From: Dennis Francis Date: Fri, 18 Sep 2015 15:18:49 +0530 Subject: fixes memleak : release references to TextPropertyPanel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/sidebar/text/TextPropertyPanel.cxx | 3 +++ svx/source/sidebar/tools/Popup.cxx | 1 + 2 files changed, 4 insertions(+) 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() -- cgit v1.2.3