Author: alg
Date: Tue Oct 15 15:51:03 2013
New Revision: 1532400
URL: http://svn.apache.org/r1532400
Log:
i122738 corrected update of FillStyle/FillAttribute UI elements
Modified:
openoffice/trunk/main/svx/inc/svx/fillctrl.hxx
openoffice/trunk/main/svx/source/tbxctrls/fillctrl.cxx
Modified: openoffice/trunk/main/svx/inc/svx/fillctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/fillctrl.hxx?rev=1532400&r1=1532399&r2=1532400&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/fillctrl.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/fillctrl.hxx Tue Oct 15 15:51:03 2013
@@ -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 );
};
//========================================================================
Modified: openoffice/trunk/main/svx/source/tbxctrls/fillctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/tbxctrls/fillctrl.cxx?rev=1532400&r1=1532399&r2=1532400&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/tbxctrls/fillctrl.cxx (original)
+++ openoffice/trunk/main/svx/source/tbxctrls/fillctrl.cxx Tue Oct 15 15:51:03
2013
@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxCon
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, SelectFillAttrHd
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 )
{
