diff options
Diffstat (limited to 'sfx2/source/control/statcach.cxx')
| -rw-r--r-- | sfx2/source/control/statcach.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 3c4d89f801..94fcde64f5 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,9 +50,6 @@ #include <svl/visitem.hxx> #include <comphelper/processfactory.hxx> -#ifndef GCC -#endif - #include <sfx2/app.hxx> #include <sfx2/appuno.hxx> #include "statcach.hxx" @@ -390,7 +388,6 @@ void SfxStateCache::SetVisibleState( BOOL bShow ) { SfxItemState eState( SFX_ITEM_AVAILABLE ); const SfxPoolItem* pState( NULL ); - sal_Bool bNotify( sal_False ); sal_Bool bDeleteItem( sal_False ); if ( bShow != bItemVisible ) @@ -407,7 +404,6 @@ void SfxStateCache::SetVisibleState( BOOL bShow ) pState = pLastItem; eState = eLastState; - bNotify = ( pState != 0 ); } else { @@ -457,10 +453,10 @@ void SfxStateCache::SetState_Impl DBG_PROFSTART(SfxStateCacheSetState); // m"ussen die Controller "uberhaupt benachrichtigt werden? - FASTBOOL bNotify = bItemDirty; + bool bNotify = bItemDirty; if ( !bItemDirty ) { - FASTBOOL bBothAvailable = pLastItem && pState && + bool bBothAvailable = pLastItem && pState && !IsInvalidItem(pState) && !IsInvalidItem(pLastItem); DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" ); if ( bBothAvailable ) @@ -575,3 +571,4 @@ void SfxStateCache::Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |