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

[Julien Nabet]

 svx/source/tbxctrls/PaletteManager.cxx |    1 +
 svx/source/tbxctrls/tbcontrl.cxx       |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 8c0cc5cd7befffc6e8e6361ba67807a799cc997f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 17 21:42:32 2017 +0200

    Related tdf#105500: leaks in PaletteManager and SvxColorToolBoxControl
    
    See comments of the bugtracker for more details
    Again thank you Alex for very useful information about leaks!
    
    Change-Id: I96743e8b167224f1bec73db5f2ba82536c7f23fa
    Reviewed-on: https://gerrit.libreoffice.org/41265
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 6e77ff700521..57cd8f0ee2d0 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -62,6 +62,7 @@ PaletteManager::PaletteManager() :
 
 PaletteManager::~PaletteManager()
 {
+    m_Palettes.clear();
 }
 
 void PaletteManager::LoadPalettes()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 02ab35acd106..66bedff5fc85 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2807,6 +2807,7 @@ void SvxColorToolBoxControl::EnsurePaletteManager()
 
 SvxColorToolBoxControl::~SvxColorToolBoxControl()
 {
+    m_xPaletteManager.reset(nullptr);
 }
 
 void SvxColorToolBoxControl::setColorSelectFunction(const ColorSelectFunction& aColorSelectFunction)