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 /editeng | |
parent | 4c93c341be1425401112eed3581e8b8a6308880d (diff) |
remove unnecessary parentheses
left over from "SVStream operator>> to Write method" conversion
Change-Id: I619eb743d7890d5c70d0a94e51ce263567fa6f3b
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/items/frmitems.cxx | 14 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 36 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 2 |
3 files changed, 26 insertions, 26 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index f7902b21ab33..66f0ba3e639b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1239,7 +1239,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) if( IsPosProtected() ) cProt |= 0x01; if( IsSizeProtected() ) cProt |= 0x02; if( IsCntntProtected() ) cProt |= 0x04; - rStrm.WriteSChar( cProt ); + rStrm.WriteSChar( cProt ); return rStrm; } @@ -1489,12 +1489,12 @@ bool SvxShadowItem::GetPresentation SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( GetLocation() ) + rStrm.WriteSChar( GetLocation() ) .WriteUInt16( GetWidth() ) - .WriteUChar( (aShadowColor.GetTransparency() > 0) ); + .WriteUChar( aShadowColor.GetTransparency() > 0 ); WriteColor( rStrm, GetColor() ); WriteColor( rStrm, GetColor() ); - rStrm.WriteSChar( (aShadowColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID + rStrm.WriteSChar( aShadowColor.GetTransparency() > 0 ? 0 : 1 ); //BRUSH_NULL : BRUSH_SOLID return rStrm; } @@ -1753,7 +1753,7 @@ namespace bool lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert, bool bGuessWidth) { - rSvxLine.SetColor( Color(rLine.Color)); + rSvxLine.SetColor( Color(rLine.Color)); if ( bGuessWidth ) { rSvxLine.GuessLinesWidths( rSvxLine.GetBorderLineStyle(), @@ -2589,7 +2589,7 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) cFlags |= 0x02; if ( IsMinDist() ) cFlags |= 0x04; - rStrm.WriteSChar( cFlags ) + rStrm.WriteSChar( cFlags ) .WriteUInt16( GetDefDist() ); const SvxBorderLine* pLine[ 2 ]; pLine[ 0 ] = GetHori(); @@ -3840,7 +3840,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) rStream.WriteUChar( false ); WriteColor( rStream, aColor ); WriteColor( rStream, aColor ); - rStream.WriteSChar( (aColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID + rStream.WriteSChar( aColor.GetTransparency() > 0 ? 0 : 1 ); //BRUSH_NULL : BRUSH_SOLID sal_uInt16 nDoLoad = 0; diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index aeca389ba342..3537700d8613 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -265,11 +265,11 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( GetPropLineSpace() ) - .WriteInt16( GetInterLineSpace() ) + rStrm.WriteSChar( GetPropLineSpace() ) + .WriteInt16( GetInterLineSpace() ) .WriteUInt16( GetLineHeight() ) - .WriteSChar( GetLineSpaceRule() ) - .WriteSChar( GetInterLineSpaceRule() ); + .WriteSChar( GetLineSpaceRule() ) + .WriteSChar( GetInterLineSpaceRule() ); return rStrm; } @@ -503,7 +503,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const nFlags |= 0x0002; if ( bLastBlock ) nFlags |= 0x0004; - rStrm.WriteSChar( nFlags ); + rStrm.WriteSChar( nFlags ); } return rStrm; } @@ -600,7 +600,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( GetValue() ); + rStrm.WriteSChar( GetValue() ); return rStrm; } @@ -795,11 +795,11 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( (sal_Int8) IsHyphen() ) - .WriteSChar( (sal_Int8) IsPageEnd() ) - .WriteSChar( GetMinLead() ) - .WriteSChar( GetMinTrail() ) - .WriteSChar( GetMaxHyphens() ); + rStrm.WriteSChar( (sal_Int8) IsHyphen() ) + .WriteSChar( (sal_Int8) IsPageEnd() ) + .WriteSChar( GetMinLead() ) + .WriteSChar( GetMinTrail() ) + .WriteSChar( GetMaxHyphens() ); return rStrm; } @@ -1158,14 +1158,14 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) nCount = (sal_uInt16)(nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0); } - rStrm.WriteSChar( ( nTabs + nCount ) ); + rStrm.WriteSChar( nTabs + nCount ); for ( short i = 0; i < nTabs; i++ ) { const SvxTabStop& rTab = (*this)[ i ]; rStrm.WriteInt32( rTab.GetTabPos() ) - .WriteSChar( rTab.GetAdjustment() ) - .WriteUChar( rTab.GetDecimal() ) - .WriteUChar( rTab.GetFill() ); + .WriteSChar( rTab.GetAdjustment() ) + .WriteUChar( rTab.GetDecimal() ) + .WriteUChar( rTab.GetFill() ); } if ( bStoreDefTabs ) @@ -1173,9 +1173,9 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) { SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT); rStrm.WriteInt32( aSwTabStop.GetTabPos() ) - .WriteSChar( aSwTabStop.GetAdjustment() ) - .WriteUChar( aSwTabStop.GetDecimal() ) - .WriteUChar( aSwTabStop.GetFill() ); + .WriteSChar( aSwTabStop.GetAdjustment() ) + .WriteUChar( aSwTabStop.GetDecimal() ) + .WriteUChar( aSwTabStop.GetFill() ); nNew += nDefDist; } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 67f22e537e4f..5209e55e3341 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -373,7 +373,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co bool bToBats = IsStarSymbol( GetFamilyName() ); rStrm.WriteUChar( GetFamily() ).WriteUChar( GetPitch() ) - .WriteUChar( (bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) ); + .WriteUChar( bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet()) ); OUString aStoreFamilyName( GetFamilyName() ); if( bToBats ) |