[Libreoffice-commits] core.git: include/svx svx/source

[Tomofumi Yagi]

 include/svx/tbcontrl.hxx         |    1 -
 svx/source/tbxctrls/tbcontrl.cxx |    9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f5dc536eae7dc28e09112ab9dd69e55fae015ee8
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date:   Sun Apr 20 16:27:10 2014 +0900

    fdo#77683 the color in the toolbar buttons doesn't change.
    
    The color in the toolbar buttons doesn't change when we use the Floating
    Font/Background/Highlight Color Toolbar.
    This problem seems happen sometimes,not always.
    
    This patch modifies that SvxColorExtToolBoxControl::StateChanged()
    in /svx/source/tbxctrls/tbcontrol.cxx handles SFX_ITEM_DEFAULT message
    always.
    
    Change-Id: If7410297db768c161287b75396186fbec3605f63
    Reviewed-on: https://gerrit.libreoffice.org/9107
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 94868ea..22c1c5e 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -269,7 +269,6 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
 
     ::svx::ToolboxButtonColorUpdater*   pBtnUpdater;
     Color                               mLastColor;
-    bool                                bChoiceFromPalette;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2c22294..2d1e733 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2482,7 +2482,6 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
     mLastColor( COL_AUTO )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
-    bChoiceFromPalette = false;
 
     // The following commands are available at the various modules
     switch( nSlotId )
@@ -2559,7 +2558,6 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
         FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
     pColorWin->StartSelection();
     SetPopupWindow( pColorWin );
-    bChoiceFromPalette = true;
     return pColorWin;
 }
 
@@ -2577,13 +2575,10 @@ void SvxColorExtToolBoxControl::StateChanged(
         rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
         rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE );
 
-        if (bChoiceFromPalette)
+        if ( SFX_ITEM_DEFAULT == eState )
         {
-            bChoiceFromPalette = false;
-
             const SvxColorItem* pItem = 0;
-            if ( SFX_ITEM_DONTCARE != eState )
-                pItem = PTR_CAST( SvxColorItem, pState );
+            pItem = PTR_CAST( SvxColorItem, pState );
 
             if ( pItem )
             {