[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - svx/source

Krisztian Pinter pin.terminator at gmail.com
Fri Jul 4 02:43:46 PDT 2014


 svx/source/tbxctrls/tbcontrl.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit ebb6c2f4a42d6d02ecaf5373e851181614b4ffe4
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date:   Fri Jul 4 11:41:28 2014 +0200

    Fix SvxColorWindow_Impl::StateChanged updating
    
    Change-Id: Ifb884f8830280d44ea3c73caf319109593bbebf9

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c905d42..b94a3cf 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1255,15 +1255,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
     {
         if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem )))
         {
-            XColorListRef pColorList = ((SvxColorListItem *)pState)->GetColorList();
-            const long nColorCount(pColorList->Count());
-            const Size aNewSize(aColorSet.layoutAllVisible(nColorCount));
-            aColorSet.SetOutputSizePixel(aNewSize);
-            static sal_Int32 nAdd = 4;
-
-            SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd));
-            aColorSet.Clear();
-            aColorSet.addEntriesForXColorList(*pColorList);
+            Update();
         }
         else if ( SFX_ITEM_DEFAULT <= eState )
         {


More information about the Libreoffice-commits mailing list