diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 20:29:27 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:27:18 +0200 |
commit | 4e26b915687acbfab5ebc260d8a7a434761721bd (patch) | |
tree | edb43f77f729e08529c8860d3641f5743009334d | |
parent | 5cefde06ea9f4347b5d2747e0d2825c3c710aa83 (diff) |
remove unnecessary casts in misc calls to SvStream.Write*
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: Ib80032e8626f5476a89b958f590441994594f4e4
-rw-r--r-- | basic/source/runtime/methods1.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/numitem.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 10 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/imap.cxx | 2 | ||||
-rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 93abf27af3be..81ad39c62bbc 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1028,7 +1028,7 @@ static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { pStrm->WriteUInt16( SbxSALINT64 ); // VarType Id } - pStrm->WriteUInt64( (sal_uInt64)rVar.GetInt64() ); + pStrm->WriteUInt64( rVar.GetInt64() ); break; case SbxSINGLE: if( bIsVariant ) diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 937801177c74..800a1308416d 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -304,9 +304,9 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC rStream.WriteUInt16( mePositionAndSpaceMode ); rStream.WriteUInt16( meLabelFollowedBy ); - rStream.WriteInt32( ( sal_Int32 ) mnListtabPos ); - rStream.WriteInt32( ( sal_Int32 ) mnFirstLineIndent ); - rStream.WriteInt32( ( sal_Int32 ) mnIndentAt ); + rStream.WriteInt32( mnListtabPos ); + rStream.WriteInt32( mnFirstLineIndent ); + rStream.WriteInt32( mnIndentAt ); return rStream; } diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 559cddd91cf1..1d574aa55880 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -308,7 +308,7 @@ void PictWriter::WriteString( const OUString & rString ) sal_Int32 nLen = aString.getLength(); if ( nLen > 255 ) nLen = 255; - pPict->WriteUChar( (sal_uInt8)nLen ); + pPict->WriteUChar( nLen ); for (sal_Int32 i = 0; i < nLen; ++i) pPict->WriteChar( aString[i] ); } @@ -1054,9 +1054,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPos = pPict->Tell(); pPict->Seek( nDstRowPos ); if ( nDstRowBytes > 250 ) - pPict->WriteUInt16( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); + pPict->WriteUInt16( nPos - nDstRowPos - 2 ); else - pPict->WriteUChar( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); + pPict->WriteUChar( nPos - nDstRowPos - 1 ); pPict->Seek( nPos ); // count percentages, Callback, check errors: @@ -1245,9 +1245,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPos = pPict->Tell(); pPict->Seek( nDstRowPos ); if ( nDstRowBytes > 250 ) - pPict->WriteUInt16( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); + pPict->WriteUInt16( nPos - nDstRowPos - 2 ); else - pPict->WriteUChar( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); + pPict->WriteUChar( nPos - nDstRowPos - 1 ); pPict->Seek( nPos ); } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 52b52892ed9b..9037313db95e 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2533,7 +2533,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) sal_Int32 nATemp = labs( (sal_Int32)( ( fNumber - nPTemp ) * 100000 ) ); if ( !nPTemp && nATemp && ( fNumber < 0.0 ) ) - mpPS->WriteChar( (sal_Char)'-' ); + mpPS->WriteChar( '-' ); const OString aNumber1(OString::number(nPTemp)); mpPS->WriteCharPtr( aNumber1.getStr() ); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 312f7559bee6..0395d403f688 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -344,7 +344,7 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa // mba: no BaseURL for data exchange if( ExportStream( aStrm, OUString(), nFmt ) ) { - aStrm.WriteChar( (sal_Char) 0 ); + aStrm.WriteChar( 0 ); aStrm.Seek( STREAM_SEEK_TO_END ); if( aStrm.Tell() <= nSizeLimit ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index bca9fc82b774..e7084f660343 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1118,7 +1118,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u break; case 3 : { - rOut.WriteUInt32( ( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + rOut.WriteUInt32( ( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( 4 ) .WriteUInt32( ( pFieldEntry->nFieldStartPos ) ); } break; @@ -1185,13 +1185,13 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u break; case 6 : { - rOut.WriteUInt32( ( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + rOut.WriteUInt32( ( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( 4 ) .WriteUInt32( ( pFieldEntry->nFieldStartPos ) ); } break; case 7 : { - rOut.WriteUInt32( ( EPP_FooterMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + rOut.WriteUInt32( ( EPP_FooterMCAtom << 16 ) ).WriteUInt32( 4 ) .WriteUInt32( ( pFieldEntry->nFieldStartPos ) ); } break; diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index f804c7faf413..05fbeafb28f4 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -82,7 +82,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const rOStm.WriteUInt16( GetType() ); rOStm.WriteUInt16( GetVersion() ); - rOStm.WriteUInt16( (sal_uInt16) eEncoding ); + rOStm.WriteUInt16( eEncoding ); const OString aRelURL = OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index d95259520263..517e83142435 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -87,11 +87,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, case '\\': case '}': case '{': - rStream.WriteChar( '\\' ).WriteChar( (sal_Char)c ); + rStream.WriteChar( '\\' ).WriteChar( c ); break; default: if (c >= ' ' && c <= '~') - rStream.WriteChar( (sal_Char)c ); + rStream.WriteChar( c ); else { //If we can't convert to the dest encoding, or if diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index a9b5013ca474..92176583a05a 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2229,7 +2229,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs ) { // "dummy char" (or any Count ?) - why? This knows only M$ - GetStream().WriteChar( (sal_Char)i ); + GetStream().WriteChar( i ); OpenContainer( ESCHER_DgContainer ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index ec257d58946a..678c65f0fb20 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3693,9 +3693,9 @@ sal_uLong WW8Export::ReplaceCr( sal_uInt8 nChar ) void WW8AttributeOutput::TableRowEnd(sal_uInt32 nDepth) { if ( nDepth == 1 ) - m_rWW8Export.WriteChar( (sal_uInt8)0x07 ); + m_rWW8Export.WriteChar( 0x07 ); else if ( nDepth > 1 ) - m_rWW8Export.WriteChar( (sal_uInt8)0x0d ); + m_rWW8Export.WriteChar( 0x0d ); //Technically in a word document this is a different value for a row ends //that are not row ends directly after a cell with a graphic. But it |