diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /svl/source/notify/brdcst.cxx | |
parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) |
rebase to DEV300_m100
Diffstat (limited to 'svl/source/notify/brdcst.cxx')
-rw-r--r-- | svl/source/notify/brdcst.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 29983ecedc17..ad7da10ed4f4 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -59,7 +59,7 @@ void SfxBroadcaster::Broadcast( const SfxHint &rHint ) if ( aListeners.Count() /*! || aGlobListeners.Count() */ ) { // notify all registered listeners exactly once - for ( USHORT n = 0; n < aListeners.Count(); ++n ) + for ( sal_uInt16 n = 0; n < aListeners.Count(); ++n ) { SfxListener* pListener = aListeners[n]; if ( pListener ) @@ -98,7 +98,7 @@ SfxBroadcaster::~SfxBroadcaster() Broadcast( SfxSimpleHint(SFX_HINT_DYING) ); // remove all still registered listeners - for ( USHORT nPos = 0; nPos < aListeners.Count(); ++nPos ) + for ( sal_uInt16 nPos = 0; nPos < aListeners.Count(); ++nPos ) { SfxListener *pListener = aListeners[nPos]; if ( pListener ) @@ -124,7 +124,7 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC ) { DBG_CTOR(SfxBroadcaster, 0); - for ( USHORT n = 0; n < rBC.aListeners.Count(); ++n ) + for ( sal_uInt16 n = 0; n < rBC.aListeners.Count(); ++n ) { SfxListener *pListener = rBC.aListeners[n]; if ( pListener ) @@ -136,12 +136,12 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC ) // add a new SfxListener to the list -BOOL SfxBroadcaster::AddListener( SfxListener& rListener ) +sal_Bool SfxBroadcaster::AddListener( SfxListener& rListener ) { DBG_CHKTHIS(SfxBroadcaster, 0); const SfxListener *pListener = &rListener; const SfxListener *pNull = 0; - USHORT nFreePos = aListeners.GetPos( pNull ); + sal_uInt16 nFreePos = aListeners.GetPos( pNull ); if ( nFreePos < aListeners.Count() ) aListeners.GetData()[nFreePos] = pListener; else if ( aListeners.Count() < (USHRT_MAX-1) ) @@ -149,12 +149,12 @@ BOOL SfxBroadcaster::AddListener( SfxListener& rListener ) else { DBG_ERROR( "array overflow" ); - return FALSE; + return sal_False; } DBG_ASSERT( USHRT_MAX != aListeners.GetPos(pListener), "AddListener failed" ); - return TRUE; + return sal_True; } //-------------------------------------------------------------------- @@ -172,8 +172,8 @@ void SfxBroadcaster::ListenersGone() void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint) { - const USHORT nCount = aListeners.Count(); - for ( USHORT i = 0; i < nCount; ++i ) + const sal_uInt16 nCount = aListeners.Count(); + for ( sal_uInt16 i = 0; i < nCount; ++i ) { SfxListener *pListener = aListeners[i]; if ( pListener ) @@ -189,7 +189,7 @@ void SfxBroadcaster::RemoveListener( SfxListener& rListener ) { {DBG_CHKTHIS(SfxBroadcaster, 0);} const SfxListener *pListener = &rListener; - USHORT nPos = aListeners.GetPos(pListener); + sal_uInt16 nPos = aListeners.GetPos(pListener); DBG_ASSERT( nPos != USHRT_MAX, "RemoveListener: Listener unknown" ); aListeners.GetData()[nPos] = 0; if ( !HasListeners() ) @@ -198,12 +198,12 @@ void SfxBroadcaster::RemoveListener( SfxListener& rListener ) //-------------------------------------------------------------------- -BOOL SfxBroadcaster::HasListeners() const +sal_Bool SfxBroadcaster::HasListeners() const { - for ( USHORT n = 0; n < aListeners.Count(); ++n ) + for ( sal_uInt16 n = 0; n < aListeners.Count(); ++n ) if ( aListeners.GetObject(n) != 0 ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } //-------------------------------------------------------------------- |