diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 20:16:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:27:17 +0200 |
commit | 04fd62096fca2c0b917ac6172104399e65933585 (patch) | |
tree | 3e1d4e9c8b9aed6b308103c5e235f71ec3b2cce1 /sot/source/sdstor | |
parent | 5501c8d2220ee3cab703d09d348e99ba3e017dba (diff) |
remove unnecessary casts in calls to SvStream.WriteInt32
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: I0c0172519479be0535a447e41a592fbf782751bd
Diffstat (limited to 'sot/source/sdstor')
-rw-r--r-- | sot/source/sdstor/stgelem.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgole.cxx | 18 | ||||
-rw-r--r-- | sot/source/sdstor/storinfo.cxx | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 06d40b3f60b5..45ad9679a744 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -164,7 +164,7 @@ bool StgHeader::Store( StgIo& rIo ) .WriteUInt16( nByteOrder ) // 1C Unicode byte order indicator .WriteInt16( nPageSize ) // 1E 1 << nPageSize = block size .WriteInt16( nDataPageSize ) // 20 1 << this size == data block size - .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt16( 0 ) + .WriteInt32( 0 ).WriteInt32( 0 ).WriteInt16( 0 ) .WriteInt32( nFATSize ) // 2C total number of FAT pages .WriteInt32( nTOCstrm ) // 30 starting page for the TOC stream .WriteInt32( nReserved ) // 34 diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 4a7cbec76986..242ff816cbd6 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -148,14 +148,14 @@ bool StgCompObjStream::Store() OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); WriteInt16( 1 ); // Version? WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator - WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10 - WriteInt32( (sal_Int32) -1L ); + WriteInt32( 0x0A03 ); // Windows 3.10 + WriteInt32( -1L ); WriteClsId( *this, aClsId ); // Class ID - WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) ); + WriteInt32( (aAsciiUserName.getLength() + 1) ); WriteCharPtr( (const char *)aAsciiUserName.getStr() ); WriteUChar( 0 ); // string terminator WriteClipboardFormat( *this, nCbFormat ); - WriteInt32( (sal_Int32) 0 ); // terminator + WriteInt32( 0 ); // terminator Commit(); return GetError() == SVSTREAM_OK; } @@ -186,11 +186,11 @@ bool StgOleStream::Store() return false; Seek( 0L ); - WriteInt32( (sal_Int32) 0x02000001 ); // OLE version, format - WriteInt32( (sal_Int32) nFlags ); // Object flags - WriteInt32( (sal_Int32) 0 ); // Update Options - WriteInt32( (sal_Int32) 0 ); // reserved - WriteInt32( (sal_Int32) 0 ); // Moniker 1 + WriteInt32( 0x02000001 ); // OLE version, format + WriteInt32( nFlags ); // Object flags + WriteInt32( 0 ); // Update Options + WriteInt32( 0 ); // reserved + WriteInt32( 0 ); // Moniker 1 Commit(); return GetError() == SVSTREAM_OK; } diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index 74e819e8c596..01a02003601e 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -72,18 +72,18 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat ) { OString aAsciiCbFmt(OUStringToOString(aCbFmt, RTL_TEXTENCODING_ASCII_US)); - rStm.WriteInt32( (sal_Int32) (aAsciiCbFmt.getLength() + 1) ); + rStm.WriteInt32( (aAsciiCbFmt.getLength() + 1) ); rStm.WriteCharPtr( (const char *)aAsciiCbFmt.getStr() ); rStm.WriteUChar( 0 ); } else if( nFormat ) { - rStm.WriteInt32( (sal_Int32) -1 ) // for Windows - .WriteInt32( (sal_Int32) nFormat ); + rStm.WriteInt32( -1 ) // for Windows + .WriteInt32( nFormat ); } else { - rStm.WriteInt32( (sal_Int32) 0 ); // no clipboard format + rStm.WriteInt32( 0 ); // no clipboard format } } |