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 /sw/source | |
| parent | 4c93c341be1425401112eed3581e8b8a6308880d (diff) | |
remove unnecessary parentheses
left over from "SVStream operator>> to Write method" conversion
Change-Id: I619eb743d7890d5c70d0a94e51ce263567fa6f3b
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 13 | ||||
| -rw-r--r-- | sw/source/core/inc/swfont.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 899802fc6be0..281477a358eb 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -962,18 +962,17 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions ) bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const { sal_uInt16 nVal = AUTOFORMAT_DATA_ID; - bool b; rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_aName, RTL_TEXTENCODING_UTF8 ); rStream.WriteUInt16( nStrResId ); - rStream.WriteUChar( ( b = bInclFont ) ); - rStream.WriteUChar( ( b = bInclJustify ) ); - rStream.WriteUChar( ( b = bInclFrame ) ); - rStream.WriteUChar( ( b = bInclBackground ) ); - rStream.WriteUChar( ( b = bInclValueFormat ) ); - rStream.WriteUChar( ( b = bInclWidthHeight ) ); + rStream.WriteUChar( bInclFont ); + rStream.WriteUChar( bInclJustify ); + rStream.WriteUChar( bInclFrame ); + rStream.WriteUChar( bInclBackground ); + rStream.WriteUChar( bInclValueFormat ); + rStream.WriteUChar( bInclWidthHeight ); { WriterSpecificAutoFormatBlock block(rStream); diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index b01ba5e64b61..1750d7f7e1c4 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -1091,7 +1091,7 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream if( nDrawStretchText ) rOS.WriteCharPtr( "\tnDrawStretchText: " ).WriteUInt16( nDrawStretchText ).WriteChar( '\n' ); if( nChangeFont ) - rOS.WriteCharPtr( "\tnChangeFont: " ).WriteUInt16( nChangeFont ).WriteChar( '\n' ); + rOS.WriteCharPtr( "\tnChangeFont: " ).WriteUInt16( nChangeFont ).WriteChar( '\n' ); if( nGetFontMetric ) rOS.WriteCharPtr( "\tnGetFontMetric: " ).WriteUInt16( nGetFontMetric ).WriteChar( '\n' ); rOS.WriteCharPtr( "}\n" ); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 232ebcc8f01b..d5f0ae026ef1 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2209,9 +2209,9 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) OpenContainer( ESCHER_DggContainer ); sal_uInt16 nColorCount = 4; - pStrm ->WriteUInt16( ( nColorCount << 4 ) ) // instance + pStrm ->WriteUInt16( nColorCount << 4 ) // instance .WriteUInt16( ESCHER_SplitMenuColors ) // record type - .WriteUInt32( ( nColorCount * 4 ) ) // size + .WriteUInt32( nColorCount * 4 ) // size .WriteUInt32( 0x08000004 ) .WriteUInt32( 0x08000001 ) .WriteUInt32( 0x08000002 ) |