[Libreoffice-commits] core.git: svx/source

[Dennis Francis]

 svx/source/sidebar/text/TextPropertyPanel.cxx |    3 +++
 svx/source/sidebar/tools/Popup.cxx            |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit ec76524221c146635e0046f567ddd31e1e28be3c
Author: Dennis Francis <dennisfrancis.in at gmail.com>
Date:   Fri Sep 18 15:18:49 2015 +0530

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 416a2e3..3ba3dd7 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 98064ee..ba03dd5 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()