From 500822eeb46698c7317f57de72b2489d98042374 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 15 Oct 2013 15:51:03 +0000 Subject: Resolves: #i122738# corrected update of FillStyle/FillAttribute UI elements (cherry picked from commit 2fc5d2946561258b012b80443cac025d851afda8) Conflicts: svx/inc/svx/fillctrl.hxx svx/source/tbxctrls/fillctrl.cxx Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea --- svx/source/tbxctrls/fillctrl.cxx | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'svx/source/tbxctrls/fillctrl.cxx') diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 00f407807de0..99b2d9cbac18 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -65,7 +65,6 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId pFillTypeLB ( NULL ), pFillAttrLB ( NULL ), bUpdate ( sal_False ), - bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { addStatusListener( OUString( ".uno:FillColor" )); @@ -97,9 +96,6 @@ void SvxFillToolBoxControl::StateChanged( { - if ( bIgnoreStatusUpdate ) - return; - if( eState == SFX_ITEM_DISABLED ) { if( nSID == SID_ATTR_FILL_STYLE ) @@ -220,13 +216,6 @@ void SvxFillToolBoxControl::StateChanged( //======================================================================== -void SvxFillToolBoxControl::IgnoreStatusUpdate( sal_Bool bSet ) -{ - bIgnoreStatusUpdate = bSet; -} - -//======================================================================== - void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pStyleItem && pState && bUpdate ) @@ -670,10 +659,8 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) aArgs[0].Name = OUString( "FillStyle" ); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; - ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillStyle" ), aArgs ); - ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) { -- cgit