diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 20:19:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:27:17 +0200 |
commit | 5cefde06ea9f4347b5d2747e0d2825c3c710aa83 (patch) | |
tree | 7f24ac5f1fe1749ea8c0135c73de80745b1c7508 /basic/source | |
parent | remove unnecessary casts in calls to SvStream.WriteInt32 (diff) | |
download | core-5cefde06ea9f4347b5d2747e0d2825c3c710aa83.tar.gz core-5cefde06ea9f4347b5d2747e0d2825c3c710aa83.zip |
remove unnecessary casts in calls to SvStream.WriteUInt32
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: I1d848f19f82783e6eabf2da37dbde78fe36ea1e0
Diffstat (limited to 'basic/source')
-rw-r--r-- | basic/source/classes/image.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxbase.cxx | 8 | ||||
-rw-r--r-- | basic/source/sbx/sbxobj.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxvar.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 95694c09ae0b..d4be5e76167f 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -322,7 +322,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) for( i = 0; i < nStrings && SbiGood( r ); i++ ) { - r.WriteUInt32( (sal_uInt32) pStringOff[ i ] ); + r.WriteUInt32( pStringOff[ i ] ); } // Then the String-Block boost::scoped_array<char> pByteStrings(new char[ nStringSize ]); @@ -332,7 +332,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet)); memcpy( pByteStrings.get() + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) ); } - r.WriteUInt32( (sal_uInt32) nStringSize ); + r.WriteUInt32( nStringSize ); r.Write( pByteStrings.get(), nStringSize ); pByteStrings.reset(); diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7ec9c00edf9a..89cb73564f65 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -259,16 +259,16 @@ bool SbxBase::Store( SvStream& rStrm ) { if( ( nFlags & SBX_DONTSTORE ) == SBX_NONE ) { - rStrm.WriteUInt32( (sal_uInt32) GetCreator() ) + rStrm.WriteUInt32( GetCreator() ) .WriteUInt16( GetSbxId() ) .WriteUInt16( GetFlags() ) .WriteUInt16( GetVersion() ); sal_Size nOldPos = rStrm.Tell(); - rStrm.WriteUInt32( (sal_uInt32) 0L ); + rStrm.WriteUInt32( 0L ); bool bRes = StoreData( rStrm ); sal_Size nNewPos = rStrm.Tell(); rStrm.Seek( nOldPos ); - rStrm.WriteUInt32( (sal_uInt32) ( nNewPos - nOldPos ) ); + rStrm.WriteUInt32( ( nNewPos - nOldPos ) ); rStrm.Seek( nNewPos ); if( rStrm.GetError() != SVSTREAM_OK ) bRes = false; @@ -383,7 +383,7 @@ bool SbxInfo::StoreData( SvStream& rStrm ) const RTL_TEXTENCODING_ASCII_US); rStrm.WriteUInt16( i->eType ) .WriteUInt16( i->nFlags ) - .WriteUInt32( (sal_uInt32) i->nUserData ); + .WriteUInt32( i->nUserData ); } return true; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 70c308d147bc..4ff8e9e810e3 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -683,14 +683,14 @@ bool SbxObject::StoreData( SvStream& rStrm ) const write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_Size nPos = rStrm.Tell(); - rStrm.WriteUInt32( (sal_uInt32) 0L ); + rStrm.WriteUInt32( 0L ); if( !StorePrivateData( rStrm ) ) { return false; } sal_Size nNew = rStrm.Tell(); rStrm.Seek( nPos ); - rStrm.WriteUInt32( (sal_uInt32) ( nNew - nPos ) ); + rStrm.WriteUInt32( ( nNew - nPos ) ); rStrm.Seek( nNew ); if( !pMethods->Store( rStrm ) ) { diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 1fe032f1a278..b05afff3334d 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1633,7 +1633,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxUINT: { sal_uInt8 n = SAL_TYPES_SIZEOFINT; - r.WriteUChar( n ).WriteUInt32( (sal_uInt32)aData.nUInt ); + r.WriteUChar( n ).WriteUInt32( aData.nUInt ); break; } case SbxEMPTY: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 75503ab2a763..01d5f3461861 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -609,7 +609,7 @@ bool SbxVariable::StoreData( SvStream& rStrm ) const } write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, maName, RTL_TEXTENCODING_ASCII_US); - rStrm.WriteUInt32( (sal_uInt32)nUserData ); + rStrm.WriteUInt32( nUserData ); if( pInfo.Is() ) { rStrm.WriteUChar( 2 ); // Version 2: with UserData! |