From 5c31515d2e54a42ceac1b21409cb730cdbb825ed Mon Sep 17 00:00:00 2001 From: Tomofumi Yagi Date: Sat, 19 Apr 2014 16:52:44 +0900 Subject: fdo#73891 Fix "UI color panel does not show the actual color in Writer" 1.The Font/Background/Highlight Color panels identify the actual color by a small frame. (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f See also fdo#32376 - Set default color to the current one in toolbar popups) 2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too. Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c Reviewed-on: https://gerrit.libreoffice.org/9103 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida --- svx/source/tbxctrls/tbcontrl.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'svx/source') diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d50e9dbde572..2c222941f25f 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1138,6 +1138,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 ) ); @@ -1210,6 +1221,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), maCommand, aArgs ); + aColorSet.SelectItem( nItemId ); } return 0; -- cgit