diff options
| author | Armin Le Grand <alg@apache.org> | 2013-10-15 15:51:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-16 11:59:49 +0100 |
| commit | 500822eeb46698c7317f57de72b2489d98042374 (patch) | |
| tree | 12cbc8a07c1382e73430c7f3fa3c5dcc6dfde458 | |
| parent | 255cfbbeaa090fd7a06130e2b621cb27ae9baca4 (diff) | |
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
| -rw-r--r-- | include/svx/fillctrl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 065321f51a64..73d531b6ac66 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -54,7 +54,6 @@ private: SvxFillAttrBox* pFillAttrLB; sal_Bool bUpdate; - sal_Bool bIgnoreStatusUpdate; sal_uInt16 eLastXFS; public: @@ -67,7 +66,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 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 ) { |