diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-10-28 18:01:51 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-10-28 22:45:07 +0200 |
| commit | 2c3c7529b5a0f66e01215ab4c3b309c8e5028000 (patch) | |
| tree | 9d74b04d8332dbffd99998c0b8c7e78dc1ed4b20 /svx | |
| parent | 2b54af3b6479d131ea7b6040eac1bb2ef0e416c1 (diff) | |
colorwindow: Update recent colors list immediately
Change-Id: Ieb6277f0962f88dfa55b6af80535ec8af497433e
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 10 |
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); |