diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-16 08:07:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-16 08:08:44 +0200 |
| commit | 2f69f6efa0ef3e6647e4a438755c171182a7554c (patch) | |
| tree | 98dd816a10afe2aed6cf5c085794ac4198b7e906 /svl | |
| parent | 4c93c341be1425401112eed3581e8b8a6308880d (diff) | |
remove unnecessary parentheses
left over from "SVStream operator>> to Write method" conversion
Change-Id: I619eb743d7890d5c70d0a94e51ce263567fa6f3b
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/filerec/filerec.cxx | 10 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 41453f6cb75c..e6ef65309536 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -43,15 +43,15 @@ static void lclWriteMiniHeader(SvStream *p, sal_uInt32 nPreTag, sal_uInt32 nStartPos, sal_uInt32 nEndPos) { - (*p).WriteUInt32( sal_uInt32(nPreTag) | - sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 ); + (*p).WriteUInt32( sal_uInt32(nPreTag) | + sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 ); } static void lclWriteHeader(SvStream *p, sal_uInt32 nRecType, sal_uInt32 nContentTag, sal_uInt32 nContentVer) { - (*p).WriteUInt32( sal_uInt32(nRecType) | - ( sal_uInt32(nContentVer) << 8 ) | - ( sal_uInt32(nContentTag) << 16 ) ); + (*p).WriteUInt32( sal_uInt32(nRecType) | + ( sal_uInt32(nContentVer) << 8 ) | + ( sal_uInt32(nContentTag) << 16 ) ); } #define SFX_REC_CONTENT_HEADER(nContentVer,n1StStartPos,nCurStartPos) \ diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 765673501d38..046503691784 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -132,7 +132,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const pImp->bStreaming = true; if ( !pStoreMaster ) { - rStream.WriteUInt16( rStream.GetVersion() >= SOFFICE_FILEFORMAT_50 + rStream.WriteUInt16( rStream.GetVersion() >= SOFFICE_FILEFORMAT_50 ? SFX_ITEMPOOL_TAG_STARTPOOL_5 : SFX_ITEMPOOL_TAG_STARTPOOL_4 ); rStream.WriteUInt8( SFX_ITEMPOOL_VER_MAJOR ).WriteUInt8( SFX_ITEMPOOL_VER_MINOR ); @@ -853,7 +853,7 @@ bool SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem* pItem) if ( pItem ) { bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); - rStream.WriteUInt32( bRealSurrogate + rStream.WriteUInt32( bRealSurrogate ? GetSurrogate( pItem ) : SFX_ITEMS_DIRECT ); return bRealSurrogate; @@ -1162,7 +1162,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, rItem.Store(rStream, nItemVersion); sal_uLong nIEnd = rStream.Tell(); rStream.Seek( nIStart-4 ); - rStream.WriteInt32( ( nIEnd-nIStart ) ); + rStream.WriteInt32( nIEnd-nIStart ); rStream.Seek( nIEnd ); } |