[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-2' - svx/source

[Julien Nabet]

 svx/source/tbxctrls/tbcontrl.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7509927b9e54c9b249a6a01adc02e8ebcbaf62f4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Sep 19 09:10:41 2017 +0200

    Revert "tdf#111894: fix leak memory with PaletteManager with SvxColorListBox"
    
    See Maxim's comment here: https://gerrit.libreoffice.org/#/c/42138/2/svx/source/tbxctrls/tbcontrl.cxx
    
    This reverts commit 61d85c4e7c30ea0f5242d927b7456190020b4fbe.
    
    Change-Id: I0d88a5f5806cb5d3b9f3a5ebb0c7baed968469ec
    Reviewed-on: https://gerrit.libreoffice.org/42445
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 324d7f28beaf36c91361debf478e74b9fced7bfb)
    Reviewed-on: https://gerrit.libreoffice.org/42449
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 07582e68d56c..ea33ee769209 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3233,6 +3233,7 @@ void SvxColorListBox::SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton)
 {
     m_nSlotId = nSlotId;
     m_bShowNoneButton = bShowNoneButton;
+    m_xColorWindow.disposeAndClear();
     m_aSelectedColor = bShowNoneButton ? GetNoneColor() : GetAutoColor(m_nSlotId);
     ShowPreview(m_aSelectedColor);
     createColorWindow();
@@ -3343,11 +3344,6 @@ SvxColorListBox::~SvxColorListBox()
 
 void SvxColorListBox::dispose()
 {
-    // TODO: reset should be made automatically but...
-    // tdf#111894: avoid memory leak with PaletteManager with SvxColorListBox
-    // m_xColorWindow is made with m_xPaletteManager
-    // so reset this last one before disposeAndClear first one
-    m_xPaletteManager.reset();
     m_xColorWindow.disposeAndClear();
     m_aColorWrapper.dispose();
     MenuButton::dispose();