diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b8f3a85067da..91b6a66f3add 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1134,6 +1134,17 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd)); aColorSet.Clear(); aColorSet.addEntriesForXColorList(*pColorList); + + short i = 0; + long nCount = pColorList->Count(); + XColorEntry* pEntry = NULL; + + for ( i = 0; i < nCount; i++ ) + { + pEntry = pColorList->GetColor(i); + if( pEntry->GetColor() == mLastColor ) + aColorSet.SelectItem( i+1 ); + } } aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) ); @@ -1206,6 +1217,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), maCommand, aArgs ); + aColorSet.SelectItem( nItemId ); } return 0; |