svx/inc/svx/fillctrl.hxx | 2 -- svx/source/tbxctrls/fillctrl.cxx | 13 ------------- 2 files changed, 15 deletions(-)
New commits: commit 2fc5d2946561258b012b80443cac025d851afda8 Author: Armin Le Grand <[email protected]> Date: Tue Oct 15 15:51:03 2013 +0000 i122738 corrected update of FillStyle/FillAttribute UI elements diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index caf0ee9..daa2b20 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -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 ); }; //======================================================================== diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 2bb0e2c..1e00fe0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -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 ) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
