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 /svl/source | |
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 'svl/source')
-rw-r--r-- | svl/source/items/macitem.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/poolio.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/numhead.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 10 | ||||
-rw-r--r-- | svl/source/numbers/zformat.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index e92109373f89..8fa633bbe1f3 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -129,7 +129,7 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const if( SVX_MACROTBL_VERSION40 <= nVersion ) rStream.WriteUInt16( nVersion ); - rStream.WriteUInt16( (sal_uInt16)aSvxMacroTable.size() ); + rStream.WriteUInt16( aSvxMacroTable.size() ); SvxMacroTable::const_iterator it = aSvxMacroTable.begin(); while( it != aSvxMacroTable.end() && rStream.GetError() == SVSTREAM_OK ) @@ -140,7 +140,7 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const writeByteString(rStream, rMac.GetMacName()); if( SVX_MACROTBL_VERSION40 <= nVersion ) - rStream.WriteUInt16( (sal_uInt16)rMac.GetScriptType() ); + rStream.WriteUInt16( rMac.GetScriptType() ); ++it; } return rStream; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 739ce2c9f43e..d5ea23d04f7a 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -224,7 +224,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const rStream.WriteUInt16( convertSfxItemKindToUInt16(pItem->GetKind()) ); else { - rStream.WriteUInt16( (sal_uInt16) pItem->GetRefCount() ); + rStream.WriteUInt16( pItem->GetRefCount() ); if( pItem->GetRefCount() > SFX_ITEMS_OLD_MAXREF ) rStream.SetError( ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ); } diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 3e3060c266cf..df521b6db1a5 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -118,7 +118,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() { sal_uLong nDataEnd = rStream.Tell(); - rStream.WriteUInt16( (sal_uInt16) SV_NUMID_SIZES ); + rStream.WriteUInt16( SV_NUMID_SIZES ); rStream.WriteUInt32( aMemStream.Tell() ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 4fcd9efcf713..6dbc878e5224 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -786,8 +786,8 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const ImpSvNumMultipleWriteHeader aHdr( rStream ); // As of 364i we store what SYSTEM locale really was, before it was hard // coded LANGUAGE_SYSTEM. - rStream.WriteUInt16( (sal_uInt16) SV_NUMBERFORMATTER_VERSION ); - rStream.WriteUInt16( (sal_uInt16) SvtSysLocale().GetLanguageTag().getLanguageType() ).WriteUInt16( (sal_uInt16) IniLnge ); + rStream.WriteUInt16( SV_NUMBERFORMATTER_VERSION ); + rStream.WriteUInt16( SvtSysLocale().GetLanguageTag().getLanguageType() ).WriteUInt16( IniLnge ); const SvNumberFormatTable* pTable = &aFTable; SvNumberFormatTable::const_iterator it = pTable->begin(); @@ -801,8 +801,8 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const pEntry->GetNewStandardDefined() || (it->first % SV_COUNTRY_LANGUAGE_OFFSET == 0) ) { rStream.WriteUInt32( it->first ) - .WriteUInt16( (sal_uInt16) LANGUAGE_SYSTEM ) - .WriteUInt16( (sal_uInt16) pEntry->GetLanguage() ); + .WriteUInt16( LANGUAGE_SYSTEM ) + .WriteUInt16( pEntry->GetLanguage() ); pEntry->Save(rStream, aHdr); } ++it; @@ -811,7 +811,7 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const // as of SV_NUMBERFORMATTER_VERSION_YEAR2000 aHdr.StartEntry(); - rStream.WriteUInt16( (sal_uInt16) GetYear2000() ); + rStream.WriteUInt16( GetYear2000() ); aHdr.EndEntry(); return rStream.GetError() ? false : true; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index aa0b8a657c14..983b07550a3c 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1983,7 +1983,7 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr rHdr.StartEntry(); rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() ); - rStream.WriteInt16( eType ).WriteDouble( fLimit1 ).WriteDouble( fLimit2 ).WriteUInt16( (sal_uInt16) eOp1 ).WriteUInt16( (sal_uInt16) eOp2 ) + rStream.WriteInt16( eType ).WriteDouble( fLimit1 ).WriteDouble( fLimit2 ).WriteUInt16( eOp1 ).WriteUInt16( eOp2 ) .WriteUChar( bOldStandard ).WriteUChar( bIsUsed ); for (sal_uInt16 i = 0; i < 4; i++) { |