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

[Stephan Bergmann]

 svx/source/tbxctrls/PaletteManager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e11931da72eabd98f9ea49ae93bd76039b283268
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 1 17:04:06 2016 +0200

    GetPaletteName() may change pColorList
    
    ...since 571866eaba914742a48938abb6c8495e97868bf1 "[GSoC] Rework of color tab"
    
    Change-Id: Ia4ad8bf675abe6b279527eaed0b0e5ebc5b2f180

diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 13f53a5..db9b012 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -188,7 +188,8 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
         pColorList = XPropertyList::AsColorList(
                             XPropertyList::CreatePropertyListFromURL(
                             XPropertyListType::Color, GetSelectedPalettePath()));
-        pColorList->SetName(GetPaletteName());
+        auto name = GetPaletteName(); // may change pColorList
+        pColorList->SetName(name);
         if(pColorList->Load())
         {
             SfxObjectShell* pShell = SfxObjectShell::Current();