Kaydet (Commit) 2fc5d294 authored tarafından Armin Le Grand's avatar Armin Le Grand

i122738 corrected update of FillStyle/FillAttribute UI elements

üst b7d59ee3
...@@ -58,7 +58,6 @@ private: ...@@ -58,7 +58,6 @@ private:
SvxFillAttrBox* pFillAttrLB; SvxFillAttrBox* pFillAttrLB;
sal_Bool bUpdate; sal_Bool bUpdate;
sal_Bool bIgnoreStatusUpdate;
sal_uInt16 eLastXFS; sal_uInt16 eLastXFS;
public: public:
...@@ -71,7 +70,6 @@ public: ...@@ -71,7 +70,6 @@ public:
const SfxPoolItem* pState ); const SfxPoolItem* pState );
void Update( const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent ); virtual Window* CreateItemWindow( Window *pParent );
void IgnoreStatusUpdate( sal_Bool bSet );
}; };
//======================================================================== //========================================================================
......
...@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId ...@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId
pFillTypeLB ( NULL ), pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ), pFillAttrLB ( NULL ),
bUpdate ( sal_False ), bUpdate ( sal_False ),
bIgnoreStatusUpdate( sal_False ),
eLastXFS ( XFILL_NONE ) eLastXFS ( XFILL_NONE )
{ {
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" ))); addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
...@@ -107,9 +106,6 @@ void SvxFillToolBoxControl::StateChanged( ...@@ -107,9 +106,6 @@ void SvxFillToolBoxControl::StateChanged(
{ {
bool bEnableControls = sal_False; bool bEnableControls = sal_False;
if ( bIgnoreStatusUpdate )
return;
if( eState == SFX_ITEM_DISABLED ) if( eState == SFX_ITEM_DISABLED )
{ {
if( nSID == SID_ATTR_FILL_STYLE ) if( nSID == SID_ATTR_FILL_STYLE )
...@@ -229,13 +225,6 @@ void SvxFillToolBoxControl::StateChanged( ...@@ -229,13 +225,6 @@ void SvxFillToolBoxControl::StateChanged(
//======================================================================== //========================================================================
void SvxFillToolBoxControl::IgnoreStatusUpdate( sal_Bool bSet )
{
bIgnoreStatusUpdate = bSet;
}
//========================================================================
void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{ {
if ( pStyleItem && pState && bUpdate ) if ( pStyleItem && pState && bUpdate )
...@@ -686,10 +675,8 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) ...@@ -686,10 +675,8 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )); aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
aXFillStyleItem.QueryValue( a ); aXFillStyleItem.QueryValue( a );
aArgs[0].Value = a; aArgs[0].Value = a;
( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
((SvxFillToolBoxControl*)GetData())->Dispatch( ((SvxFillToolBoxControl*)GetData())->Dispatch(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs ); ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
switch( eXFS ) switch( eXFS )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment