summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 8900416a8fac..abcf9c945091 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1242,11 +1242,15 @@ IMPL_LINK(SvxColorWindow_Impl, SelectHdl, SvxColorValueSet*, pColorSet)
while in Dispatch()), accessing members will crash in this case. */
pColorSet->SetNoSelection();
- if ( IsInPopupMode() )
- EndPopupMode();
-
if ( pColorSet != mpRecentColorSet )
+ {
mrPaletteManager.AddRecentColor( aColor );
+ if ( !IsInPopupMode() )
+ mrPaletteManager.ReloadRecentColorSet( *mpRecentColorSet );
+ }
+
+ if ( IsInPopupMode() )
+ EndPopupMode();
if ( maSelectedLink.IsSet() )
maSelectedLink.Call(&aColor);