diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-08-17 21:42:32 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-08-17 22:31:06 +0200 |
| commit | 8c0cc5cd7befffc6e8e6361ba67807a799cc997f (patch) | |
| tree | 5a913960444ec38aeb26458259e0d5a3ca35a046 | |
| parent | 64a3124d928f337011cad137c2c059f1ef064377 (diff) | |
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@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
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) |