diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-22 02:19:36 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-01 01:48:06 +0200 |
commit | d81286b78ff90cf4cde17c5000cd8eda6ea4a380 (patch) | |
tree | f23e21dc2e3d9d2b319e48ea70a3446cbe30fece /sc | |
parent | d2e1dd559f4009a83f3ce6cb6617dfced010be74 (diff) |
sal_Bool to bool in bcaslot.[ch]xx
Change-Id: Ic38f5421da373a68eeee8fe7863450dd5025e312
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/bcaslot.cxx | 22 | ||||
-rw-r--r-- | sc/source/core/inc/bcaslot.hxx | 20 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index e55c1836bf15..b7ed7f5d411c 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -255,13 +255,13 @@ ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( } -sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) +bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) { if (aBroadcastAreaTbl.empty()) return false; bool bInBroadcast = mbInBroadcastIteration; mbInBroadcastIteration = true; - sal_Bool bIsBroadcasted = false; + bool bIsBroadcasted = false; const ScAddress& rAddress = rHint.GetAddress(); for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()), aIterEnd( aBroadcastAreaTbl.end()); aIter != aIterEnd; ++aIter ) @@ -275,7 +275,7 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) if (!pBASM->IsInBulkBroadcast() || pBASM->InsertBulkArea( pArea)) { pArea->GetBroadcaster().Broadcast( rHint); - bIsBroadcasted = sal_True; + bIsBroadcasted = true; } } } @@ -288,14 +288,14 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) } -sal_Bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, +bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint) { if (aBroadcastAreaTbl.empty()) return false; bool bInBroadcast = mbInBroadcastIteration; mbInBroadcastIteration = true; - sal_Bool bIsBroadcasted = false; + bool bIsBroadcasted = false; for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()), aIterEnd( aBroadcastAreaTbl.end()); aIter != aIterEnd; ++aIter ) { @@ -308,7 +308,7 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, if (!pBASM->IsInBulkBroadcast() || pBASM->InsertBulkArea( pArea)) { pArea->GetBroadcaster().Broadcast( rHint); - bIsBroadcasted = sal_True; + bIsBroadcasted = true; } } } @@ -376,7 +376,7 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode, pArea->DecRef(); if (pBASM->IsInBulkBroadcast()) pBASM->RemoveBulkArea( pArea); - pArea->SetInUpdateChain( sal_True ); + pArea->SetInUpdateChain( true ); ScBroadcastArea* pUC = pBASM->GetEOUpdateChain(); if ( pUC ) pUC->SetUpdateChainNext( pArea ); @@ -653,7 +653,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, } -sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const +bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const { const ScAddress& rAddress = rHint.GetAddress(); if ( rAddress == BCA_BRDCST_ALWAYS ) @@ -661,7 +661,7 @@ sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const if ( pBCAlways ) { pBCAlways->Broadcast( rHint ); - return sal_True; + return true; } else return false; @@ -681,10 +681,10 @@ sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const } -sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, +bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const { - sal_Bool bBroadcasted = false; + bool bBroadcasted = false; SCTAB nEndTab = rRange.aEnd.Tab(); for (TableSlotsMap::const_iterator iTab( aTableSlotsMap.lower_bound( rRange.aStart.Tab())); iTab != aTableSlotsMap.end() && (*iTab).first <= nEndTab; ++iTab) diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 53e13d62735c..ca11dd975096 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -39,7 +39,7 @@ private: SvtBroadcaster aBroadcaster; ScRange aRange; sal_uLong nRefCount; - sal_Bool bInUpdateChain; + bool bInUpdateChain; public: ScBroadcastArea( const ScRange& rRange ) @@ -57,8 +57,8 @@ public: inline sal_uLong GetRef() { return nRefCount; } inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; } inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; } - inline sal_Bool IsInUpdateChain() const { return bInUpdateChain; } - inline void SetInUpdateChain( sal_Bool b ) { bInUpdateChain = b; } + inline bool IsInUpdateChain() const { return bInUpdateChain; } + inline void SetInUpdateChain( bool b ) { bInUpdateChain = b; } /** Equalness of this or range. */ inline bool operator==( const ScBroadcastArea & rArea ) const; @@ -139,7 +139,7 @@ private: whether there would be an overflow when adding an area, setting the proper state if so. - @return sal_True if a HardRecalcState is effective and area is not to be + @return true if a HardRecalcState is effective and area is not to be added. */ bool CheckHardRecalcStateCondition() const; @@ -173,7 +173,7 @@ public: as InsertListeningArea(), so use that instead. @return - sal_True if rpArea passed was NULL and ScBroadcastArea is newly + true if rpArea passed was NULL and ScBroadcastArea is newly created. */ bool StartListeningArea( const ScRange& rRange, @@ -189,9 +189,9 @@ public: void EndListeningArea( const ScRange& rRange, SvtListener* pListener, ScBroadcastArea*& rpArea ); - sal_Bool AreaBroadcast( const ScHint& rHint ); - /// @return sal_True if at least one broadcast occurred. - sal_Bool AreaBroadcastInRange( const ScRange& rRange, + bool AreaBroadcast( const ScHint& rHint ); + /// @return true if at least one broadcast occurred. + bool AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ); void DelBroadcastAreasInRange( const ScRange& rRange ); void UpdateRemove( UpdateRefMode eUpdateRefMode, @@ -281,9 +281,9 @@ public: SvtListener* pListener ); void EndListeningArea( const ScRange& rRange, SvtListener* pListener ); - sal_Bool AreaBroadcast( const ScHint& rHint ) const; + bool AreaBroadcast( const ScHint& rHint ) const; // return: at least one broadcast occurred - sal_Bool AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const; + bool AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const; void DelBroadcastAreasInRange( const ScRange& rRange ); void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, const ScRange& rRange, |