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:
SvxFillAttrBox* pFillAttrLB;
sal_Bool bUpdate;
sal_Bool bIgnoreStatusUpdate;
sal_uInt16 eLastXFS;
public:
......@@ -71,7 +70,6 @@ public:
const SfxPoolItem* pState );
void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
void IgnoreStatusUpdate( sal_Bool bSet );
};
//========================================================================
......
......@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId
pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ),
bUpdate ( sal_False ),
bIgnoreStatusUpdate( sal_False ),
eLastXFS ( XFILL_NONE )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
......@@ -107,9 +106,6 @@ void SvxFillToolBoxControl::StateChanged(
{
bool bEnableControls = sal_False;
if ( bIgnoreStatusUpdate )
return;
if( eState == SFX_ITEM_DISABLED )
{
if( nSID == SID_ATTR_FILL_STYLE )
......@@ -229,13 +225,6 @@ void SvxFillToolBoxControl::StateChanged(
//========================================================================
void SvxFillToolBoxControl::IgnoreStatusUpdate( sal_Bool bSet )
{
bIgnoreStatusUpdate = bSet;
}
//========================================================================
void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pStyleItem && pState && bUpdate )
......@@ -686,10 +675,8 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
aXFillStyleItem.QueryValue( a );
aArgs[0].Value = a;
( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
((SvxFillToolBoxControl*)GetData())->Dispatch(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
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