mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1357162: Logically dead code

Browse Source 
...after 07da25064f "loplugin:constantparam in
svl"

Change-Id: I6f7cc3ca0822de079c0855ee46f66368bd78e0b7
This commit is contained in:
Stephan Bergmann
2016-03-29 09:21:15 +02:00
parent 9b1307f790
commit ed7ad21acf
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
svl/source/items/poolio.cxx
View File

@@ -1245,29 +1245,22 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream,
rStream.ReadUInt16( nVersion ).ReadUInt32( nLen ); rStream.ReadUInt16( nVersion ).ReadUInt32( nLen );
sal_uLong nIStart = rStream.Tell(); sal_uLong nIStart = rStream.Tell();
// WhichId known in this version? // Load Item directly
if ( nWhich ) SfxPoolItem *pNewItem =
{ pRefPool->GetDefaultItem(nWhich).Create(rStream, nVersion);
// Load Item directly if ( bDontPut )
SfxPoolItem *pNewItem = pItem = pNewItem;
pRefPool->GetDefaultItem(nWhich).Create(rStream, nVersion);
if ( bDontPut )
pItem = pNewItem;
else
if ( pNewItem )
{
pItem = &Put(*pNewItem);
delete pNewItem;
}
else
pItem = nullptr;
sal_uLong nIEnd = rStream.Tell();
DBG_ASSERT( nIEnd <= (nIStart+nLen), "read past end of item" );
if ( (nIStart+nLen) != nIEnd )
rStream.Seek( nIStart+nLen );
}
else else
// SKip Item if ( pNewItem )
{
pItem = &Put(*pNewItem);
delete pNewItem;
}
else
pItem = nullptr;
sal_uLong nIEnd = rStream.Tell();
DBG_ASSERT( nIEnd <= (nIStart+nLen), "read past end of item" );
if ( (nIStart+nLen) != nIEnd )
rStream.Seek( nIStart+nLen ); rStream.Seek( nIStart+nLen );
} }