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

[Noel Grandin]

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

New commits:
commit bc8a46534e03d9dc81c92756957cbae84d72b953
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Aug 18 08:58:45 2017 +0200

    Revert "Related tdf#105500: leaks in PaletteManager and SvxColorToolBoxControl"
    
    This reverts commit 8c0cc5cd7befffc6e8e6361ba67807a799cc997f.
    
    These changes are unnecessary, the compiler already automatically
    generates the necessary code.

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