summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/PaletteManager.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-01 17:04:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-01 17:04:06 +0200
commite11931da72eabd98f9ea49ae93bd76039b283268 (patch)
tree67ae702d9f6577f896daf301fb3440bb052e4331 /svx/source/tbxctrls/PaletteManager.cxx
parent9f765added5d3c672de4bda4493b65f9ce1b8187 (diff)
GetPaletteName() may change pColorList
...since 571866eaba914742a48938abb6c8495e97868bf1 "[GSoC] Rework of color tab" Change-Id: Ia4ad8bf675abe6b279527eaed0b0e5ebc5b2f180
Diffstat (limited to 'svx/source/tbxctrls/PaletteManager.cxx')
-rw-r--r--svx/source/tbxctrls/PaletteManager.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 13f53a5f67a3..db9b012fc423 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();