summaryrefslogtreecommitdiff
path: root/svl/source/items/poolio.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svl/source/items/poolio.cxx')
-rw-r--r--svl/source/items/poolio.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index bf5fba842f49..4edf4aade20b 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -122,7 +122,7 @@ static SfxItemKind convertUInt16ToSfxItemKind(sal_uInt16 x)
SvStream &SfxItemPool::Store(SvStream &rStream) const
{
// Find StoreMaster
- SfxItemPool *pStoreMaster = pImp->mpMaster != this ? pImp->mpMaster : 0;
+ SfxItemPool *pStoreMaster = pImp->mpMaster != this ? pImp->mpMaster : nullptr;
while ( pStoreMaster && !pStoreMaster->pImp->bStreaming )
pStoreMaster = pStoreMaster->pImp->mpSecondary;
@@ -280,7 +280,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
}
// Write out additional Pools
- pStoringPool_ = 0;
+ pStoringPool_ = nullptr;
aPoolRec.Close();
if ( !rStream.GetError() && pImp->mpSecondary )
pImp->mpSecondary->Store( rStream );
@@ -364,7 +364,7 @@ void SfxItemPool_Impl::readTheItems (
SfxMultiRecordReader aItemsRec( &rStream, SFX_ITEMPOOL_REC_ITEMS );
SfxPoolItemArray_Impl *pNewArr = new SfxPoolItemArray_Impl();
- SfxPoolItem *pItem = 0;
+ SfxPoolItem *pItem = nullptr;
sal_uLong n, nLastSurrogate = sal_uLong(-1);
while (aItemsRec.GetContent())
@@ -376,7 +376,7 @@ void SfxItemPool_Impl::readTheItems (
// Fill up missing ones
// coverity[tainted_data] - ignore this, though we should finally kill off this format
- for ( pItem = 0, n = nLastSurrogate+1; n < nSurrogate; ++n )
+ for ( pItem = nullptr, n = nLastSurrogate+1; n < nSurrogate; ++n )
pNewArr->push_back( pItem );
nLastSurrogate = nSurrogate;
@@ -400,7 +400,7 @@ void SfxItemPool_Impl::readTheItems (
}
// Fill up missing ones
- for ( pItem = 0, n = nLastSurrogate+1; n < nItemCount; ++n )
+ for ( pItem = nullptr, n = nLastSurrogate+1; n < nItemCount; ++n )
pNewArr->push_back( pItem );
SfxPoolItemArray_Impl *pOldArr = *ppArr;
@@ -408,9 +408,9 @@ void SfxItemPool_Impl::readTheItems (
// Remember items that are already in the pool
bool bEmpty = true;
- if ( 0 != pOldArr )
+ if ( nullptr != pOldArr )
for ( n = 0; bEmpty && n < pOldArr->size(); ++n )
- bEmpty = pOldArr->operator[](n) == 0;
+ bEmpty = pOldArr->operator[](n) == nullptr;
SAL_WARN_IF( !bEmpty, "svl", "loading non-empty pool" );
if ( !bEmpty )
{
@@ -492,7 +492,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
}
// Find LoadMaster
- SfxItemPool *pLoadMaster = pImp->mpMaster != this ? pImp->mpMaster : 0;
+ SfxItemPool *pLoadMaster = pImp->mpMaster != this ? pImp->mpMaster : nullptr;
while ( pLoadMaster && !pLoadMaster->pImp->bStreaming )
pLoadMaster = pLoadMaster->pImp->mpSecondary;
@@ -779,13 +779,13 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
// Is item stored directly?
if ( SFX_ITEMS_DIRECT == nSurrogat )
- return 0;
+ return nullptr;
// Item does not exist?
if ( SFX_ITEMS_NULL == nSurrogat )
{
rWhich = 0;
- return 0;
+ return nullptr;
}
// If the Pool in the stream has the same structure, the surrogate
@@ -810,7 +810,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
// Can the surrogate be resolved?
if ( bResolvable )
{
- const SfxPoolItem *pItem = 0;
+ const SfxPoolItem *pItem = nullptr;
for ( SfxItemPool *pTarget = this; pTarget; pTarget = pTarget->pImp->mpSecondary )
{
// Found the right (Range-)Pool?
@@ -825,12 +825,12 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
pTarget->pImp->maPoolItems[pTarget->GetIndex_Impl(rWhich)];
pItem = pItemArr && nSurrogat < pItemArr->size()
? (*pItemArr)[nSurrogat]
- : 0;
+ : nullptr;
if ( !pItem )
{
OSL_FAIL( "can't resolve surrogate" );
rWhich = 0; // Just to be sure; for the right StreamPos
- return 0;
+ return nullptr;
}
// Reload from RefPool?
@@ -850,7 +850,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
SFX_ASSERT( false, rWhich, "can't resolve Which-Id in LoadSurrogate" );
}
- return 0;
+ return nullptr;
}
@@ -1159,7 +1159,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
const SfxItemPool *pPool = this;
while ( !pPool->IsInStoringRange(rItem.Which()) )
- if ( 0 == ( pPool = pPool->pImp->mpSecondary ) )
+ if ( nullptr == ( pPool = pPool->pImp->mpSecondary ) )
return false;
DBG_ASSERT( !pImp->bInSetItem || dynamic_cast<const SfxSetItem*>( &rItem ) == nullptr,
@@ -1216,7 +1216,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
rStream.ReadUInt16( nVersion ).ReadUInt16( nLen );
rStream.SeekRel( nLen );
}
- return 0;
+ return nullptr;
}
}
@@ -1230,7 +1230,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
"loading SetItem in ItemSet of SetItem" );
// Are we loading via surrogate?
- const SfxPoolItem *pItem = 0;
+ const SfxPoolItem *pItem = nullptr;
if ( !bDirect )
{
// WhichId known in this version?
@@ -1266,7 +1266,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
delete pNewItem;
}
else
- pItem = 0;
+ pItem = nullptr;
sal_uLong nIEnd = rStream.Tell();
DBG_ASSERT( nIEnd <= (nIStart+nLen), "read past end of item" );
if ( (nIStart+nLen) != nIEnd )