diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 17:56:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:26:48 +0200 |
commit | 5501c8d2220ee3cab703d09d348e99ba3e017dba (patch) | |
tree | ce59b08fa7ad1192f3038266db1be0d64a05c0c3 /svx | |
parent | dedfa972bc19f21e6fab7c38a64ae9543142f416 (diff) |
remove unnecessary casts in calls to SvStream.WriteUInt16
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: I482ca7abb84613971e7e8f839f7aa67a65cd71ff
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/gallery2/galobj.cxx | 4 | ||||
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 6 | ||||
-rw-r--r-- | svx/source/items/hlnkitem.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 87686f867d3e..4fe3e054e6bc 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -173,7 +173,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const { static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); - rOut.WriteUInt32( nInventor ).WriteUInt16( (sal_uInt16) 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( (sal_uInt16) GetObjKind() ); + rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( GetObjKind() ); rOut.WriteUChar( bIsThumbBmp ); if( bIsThumbBmp ) @@ -367,7 +367,7 @@ BitmapEx SgaObjectSound::GetThumbBmp() const void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - rOut.WriteUInt16( (sal_uInt16) eSoundType ); + rOut.WriteUInt16( eSoundType ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index df2630420657..dea0c106b485 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1297,9 +1297,9 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_uInt32 nCount = GetObjectCount(); bool bRel; - rOStm.WriteUInt16( (sal_uInt16) 0x0004 ); + rOStm.WriteUInt16( 0x0004 ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); - rOStm.WriteUInt32( nCount ).WriteUInt16( (sal_uInt16) osl_getThreadTextEncoding() ); + rOStm.WriteUInt32( nCount ).WriteUInt16( osl_getThreadTextEncoding() ); for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -1351,7 +1351,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const rOStm.WriteUChar( bRel ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); - rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16) pObj->eObjKind ); + rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( pObj->eObjKind ); } // more recently, a 512-byte reserve buffer is written, diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 2f9573f3319a..ba289978e3d2 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -76,7 +76,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ const SvxMacro& rMac = it->second; if( STARBASIC == rMac.GetScriptType() ) { - rStrm.WriteUInt16( (sal_uInt16)it->first ); + rStrm.WriteUInt16( it->first ); // UNICODE: rStrm << pMac->GetLibName(); rStrm.WriteUniOrByteString(rMac.GetLibName(), rStrm.GetStreamCharSet()); @@ -98,7 +98,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ const SvxMacro& rMac = it->second; if( STARBASIC != rMac.GetScriptType() ) { - rStrm.WriteUInt16( (sal_uInt16)it->first ); + rStrm.WriteUInt16( it->first ); // UNICODE: rStrm << pMac->GetLibName(); rStrm.WriteUniOrByteString(rMac.GetLibName(), rStrm.GetStreamCharSet()); @@ -106,7 +106,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // UNICODE: rStrm << pMac->GetMacName(); rStrm.WriteUniOrByteString(rMac.GetMacName(), rStrm.GetStreamCharSet()); - rStrm.WriteUInt16( (sal_uInt16)rMac.GetScriptType() ); + rStrm.WriteUInt16( rMac.GetScriptType() ); } } } |