diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 09:21:15 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 09:21:15 +0200 |
commit | ed7ad21acf35ffdad8656b25e664131bcf38b331 (patch) | |
tree | 56eb3da616f4c3729e18a1a6b765ef09f776c950 /svl | |
parent | 9b1307f790c550d91b062cbdf1e3fe41d7e7ea4a (diff) |
cid#1357162: Logically dead code
...after 07da25064f75cdf7163669f9bf860a9ee2f8b33c "loplugin:constantparam in
svl"
Change-Id: I6f7cc3ca0822de079c0855ee46f66368bd78e0b7
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/items/poolio.cxx | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index bad0a854ba5c..4cd3fabc893f 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -1245,29 +1245,22 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, rStream.ReadUInt16( nVersion ).ReadUInt32( nLen ); sal_uLong nIStart = rStream.Tell(); - // WhichId known in this version? - if ( nWhich ) - { - // Load Item directly - SfxPoolItem *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 ); - } + // Load Item directly + SfxPoolItem *pNewItem = + pRefPool->GetDefaultItem(nWhich).Create(rStream, nVersion); + if ( bDontPut ) + pItem = pNewItem; 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 ); } |