Attachment 97630 Details for Bug 77683 – fix for fdo#77683

[patch] fix for fdo#77683

0001-fix-fdo77683.diff (text/plain), 2.04 KB, created by Tomofumi Yagi on 2014-04-20 03:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomofumi Yagi

Created: 2014-04-20 03:10:34 UTC

Size: 2.04 KB

patch

obsolete

>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 d50e9db..d3425e8 100644
>--- a/svx/source/tbxctrls/tbcontrl.cxx
>+++ b/svx/source/tbxctrls/tbcontrl.cxx
>@@ -2470,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 )
>@@ -2547,7 +2558,6 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
>         FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
>     pColorWin->StartSelection();
>     SetPopupWindow( pColorWin );
>-    bChoiceFromPalette = true;
>     return pColorWin;
> }
> 
>@@ -2565,18 +2575,16 @@ 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 );
> 
>             if ( pItem )
>             {
>-                pBtnUpdater->Update( pItem->GetValue() );
>-                mLastColor = pItem->GetValue();
>+                    pBtnUpdater->Update( pItem->GetValue() );
>+                    mLastColor = pItem->GetValue();
>             }
>         }
>     }

Actions: View

Attachments on bug 77683: 97627 | 97628 | 97630