strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves fdo#32376 Set default color to the current one in toolbar popup

Browse source
This commit is contained in:
Kurosawa Takeshi 2011-02-25 15:45:22 +00:00 committed by Caolán McNamara
parent f4340a7237
commit 574b67398c
5 changed files with 59 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
svx/inc/svx/extrusioncolorcontrol.hxx
View file

@ -39,6 +39,7 @@ class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
{
private:
ToolboxButtonColorUpdater* mpBtnUpdater;
Color mLastColor;
public:
SFX_DECL_TOOLBOX_CONTROL();

6
svx/inc/svx/tbcontrl.hxx
View file

@ -287,6 +287,7 @@ public:
class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl
{
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
public:
SFX_DECL_TOOLBOX_CONTROL();
@ -314,6 +315,7 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl
// SfxStatusForwarder aForward;
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
public:
SFX_DECL_TOOLBOX_CONTROL();
@ -338,6 +340,8 @@ public:
class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
{
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
public:
SFX_DECL_TOOLBOX_CONTROL();
SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
@ -398,6 +402,8 @@ public:
class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl
{
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
public:
SFX_DECL_TOOLBOX_CONTROL();
SvxFrameLineColorToolBoxControl( USHORT nSlotId,

4
svx/source/tbxctrls/colorwindow.hxx
View file

@ -22,6 +22,7 @@ private:
const USHORT theSlotId;
ValueSet aColorSet;
rtl::OUString maCommand;
const Color mLastColor;
#if _SOLAR__PRIVATE
DECL_LINK( SelectHdl, void * );
@ -36,7 +37,8 @@ public:
USHORT nSlotId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const String& rWndTitle,
Window* pParentWindow );
Window* pParentWindow,
const Color rLastColor = COL_AUTO);
~SvxColorWindow_Impl();
void StartSelection();

9
svx/source/tbxctrls/extrusioncontrols.cxx
View file

@ -989,7 +989,8 @@ SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem );
ExtrusionColorControl::ExtrusionColorControl(
USHORT nSlotId, USHORT nId, ToolBox& rTbx )
: SfxToolBoxControl ( nSlotId, nId, rTbx )
: SfxToolBoxControl ( nSlotId, nId, rTbx ),
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW );
@ -1018,7 +1019,8 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
SID_EXTRUSION_3D_COLOR,
m_xFrame,
SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ),
&GetToolBox() );
&GetToolBox(),
mLastColor );
pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
pColorWin->StartSelection();
SetPopupWindow( pColorWin );
@ -1040,7 +1042,10 @@ void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, cons
pItem = PTR_CAST( SvxColorItem, pState );
if ( pItem )
{
mpBtnUpdater->Update( pItem->GetValue());
mLastColor = pItem->GetValue();
}
}
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );

54
svx/source/tbxctrls/tbcontrl.cxx
View file

@ -821,13 +821,15 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
USHORT nSlotId,
const Reference< XFrame >& rFrame,
const String& rWndTitle,
Window* pParentWindow ) :
Window* pParentWindow,
const ::Color rLastColor ) :
SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
theSlotId( nSlotId ),
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
maCommand( rCommand )
maCommand( rCommand ),
mLastColor( rLastColor )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
@ -883,6 +885,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
{
pEntry = pColorTable->GetColor(i);
aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
if( pEntry->GetColor() == mLastColor )
aColorSet.SelectItem( i+1 );
}
while ( i < PALETTE_SIZE )
@ -921,7 +925,7 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt )
SfxPopupWindow* SvxColorWindow_Impl::Clone() const
{
return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent() );
return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent(), mLastColor );
}
// -----------------------------------------------------------------------
@ -930,7 +934,6 @@ IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
{
USHORT nItemId = aColorSet.GetSelectItemId();
SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId );
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls.
This instance may be deleted in the meantime (i.e. when a dialog is opened
while in Dispatch()), accessing members will crash in this case. */
@ -2333,7 +2336,8 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl(
: SfxToolBoxControl( nSlotId, nId, rTbx ),
pBtnUpdater( new ::svx::ToolboxButtonColorUpdater(
nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW ))
nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )),
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
@ -2362,7 +2366,8 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
SID_ATTR_CHAR_COLOR,
m_xFrame,
SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
&GetToolBox() );
&GetToolBox(),
mLastColor);
pColorWin->StartPopupMode( &GetToolBox(),
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
@ -2386,7 +2391,10 @@ void SvxFontColorToolBoxControl::StateChanged(
pItem = PTR_CAST( SvxColorItem, pState );
if ( pItem )
pBtnUpdater->Update( pItem->GetValue());
{
pBtnUpdater->Update( pItem->GetValue() );
mLastColor= pItem->GetValue();
}
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@ -2398,7 +2406,8 @@ void SvxFontColorToolBoxControl::StateChanged(
SvxColorToolBoxControl::SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
SfxToolBoxControl( nSlotId, nId, rTbx ),
mLastColor( COL_AUTO )
{
if ( nSlotId == SID_BACKGROUND_COLOR )
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@ -2433,7 +2442,8 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
SID_BACKGROUND_COLOR,
m_xFrame,
SVX_RESSTR(nResId),
&GetToolBox() );
&GetToolBox(),
mLastColor);
pColorWin->StartPopupMode( &GetToolBox(),
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
@ -2445,16 +2455,16 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
// -----------------------------------------------------------------------
void SvxColorToolBoxControl::StateChanged(
USHORT , SfxItemState eState, const SfxPoolItem* pState )
{
const SvxColorItem* pItem = 0;
if ( SFX_ITEM_DONTCARE != eState )
pItem = PTR_CAST( SvxColorItem, pState );
if ( pItem )
if ( pItem ) {
pBtnUpdater->Update( pItem->GetValue() );
mLastColor= pItem->GetValue();
}
USHORT nId = GetId();
ToolBox& rTbx = GetToolBox();
@ -2472,7 +2482,8 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
pBtnUpdater(0)
pBtnUpdater(0),
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
// The following commands are available at the writer module.
@ -2510,7 +2521,8 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow()
GetSlotId(),
m_xFrame,
SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
&GetToolBox() );
&GetToolBox(),
mLastColor );
if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND )
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) );
@ -2549,7 +2561,10 @@ void SvxFontColorExtToolBoxControl::StateChanged(
pItem = PTR_CAST( SvxColorItem, pState );
if ( pItem )
{
pBtnUpdater->Update( pItem->GetValue() );
mLastColor = pItem->GetValue();
}
}
}
@ -2685,7 +2700,8 @@ SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl(
ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
pBtnUpdater(new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ))
pBtnUpdater(new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() )),
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
@ -2714,7 +2730,8 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
SID_FRAME_LINECOLOR,
m_xFrame,
SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
&GetToolBox() );
&GetToolBox(),
mLastColor);
pColorWin->StartPopupMode( &GetToolBox(),
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
@ -2726,9 +2743,7 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
// -----------------------------------------------------------------------
void SvxFrameLineColorToolBoxControl::StateChanged(
USHORT , SfxItemState eState, const SfxPoolItem* pState )
{
USHORT nId = GetId();
ToolBox& rTbx = GetToolBox();
@ -2740,7 +2755,10 @@ void SvxFrameLineColorToolBoxControl::StateChanged(
{
pItem = PTR_CAST( SvxColorItem, pState );
if ( pItem )
{
pBtnUpdater->Update( pItem->GetValue());
mLastColor = pItem->GetValue();
}
}
}