diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-24 20:32:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:25:40 +0200 |
commit | 8f684e21de081350f0ce1f0bd0420f4775c5388d (patch) | |
tree | 66da106d499159a5ee1da6e6fdfe3b95a46d9a4e /vcl/source/gdi | |
parent | ebdc36c12dbdd8bc2305adabf83c95c666f7b04f (diff) |
remove unnecessary static_cast's
left over from our conversion of the SvStream output operators
to more specific methods
e Please enter the commit message for your changes. Lines starting
Change-Id: Ibfe7635451ef7b8813d7a59c78c5223092a17ad5
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/graphictools.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/regionband.cxx | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 8a3454ed2012..b9128669fd93 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -2385,7 +2385,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data WritePair( rOStm, rStartPt ); - rOStm.WriteInt32( nWidth ).WriteUInt32( static_cast<sal_uInt32>(eStrikeout) ).WriteUInt32( static_cast<sal_uInt32>(eUnderline) ); + rOStm.WriteInt32( nWidth ).WriteUInt32( eStrikeout ).WriteUInt32( eUnderline ); rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment @@ -2437,7 +2437,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, default: { OStringBuffer aStr("Missing implementation for Action#: "); - aStr.append(static_cast<sal_Int32>(pAction->GetType())); + aStr.append(pAction->GetType()); aStr.append('!'); OSL_FAIL(aStr.getStr()); } diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 96fba1aa0985..8cfc4e49b2d8 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -129,7 +129,7 @@ SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass rOStm.WriteUInt16( nTmp ); rOStm.WriteDouble( rClass.mfMiterLimit ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(rClass.maDashArray.size()) ); + rOStm.WriteUInt32( rClass.maDashArray.size() ); size_t i; for(i=0; i<rClass.maDashArray.size(); ++i) rOStm.WriteDouble( rClass.maDashArray[i] ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index c6b524b4243b..c572852d4c0f 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1548,10 +1548,10 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) //#fdo39428 SvStream no longer supports operator<<(long) WritePair( rOStm, maPos ); rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnWidth) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(meStrikeout) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(meUnderline) ); + rOStm.WriteUInt32( meStrikeout ); + rOStm.WriteUInt32( meUnderline ); // new in version 2 - rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); + rOStm.WriteUInt32( meOverline ); } void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index a0e95d5f649d..028ab024e571 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -243,8 +243,8 @@ bool PNGWriterImpl::Write( SvStream& rOStm ) /* png signature is always an array of 8 bytes */ sal_uInt16 nOldMode = rOStm.GetNumberFormatInt(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(0x89504e47) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(0x0d0a1a0a) ); + rOStm.WriteUInt32( 0x89504e47 ); + rOStm.WriteUInt32( 0x0d0a1a0a ); std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() ); std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() ); diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index adaa4b02013f..99c221540f99 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -264,8 +264,8 @@ void RegionBand::save(SvStream& rOStrm) const { // put boundaries rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_BANDHEADER ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYTop) ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYBottom) ); + rOStrm.WriteInt32( pBand->mnYTop ); + rOStrm.WriteInt32( pBand->mnYBottom ); // put separations of current band ImplRegionBandSep* pSep = pBand->mpFirstSep; @@ -274,8 +274,8 @@ void RegionBand::save(SvStream& rOStrm) const { // put separation rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_SEPARATION ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXLeft) ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXRight) ); + rOStrm.WriteInt32( pSep->mnXLeft ); + rOStrm.WriteInt32( pSep->mnXRight ); // next separation from current band pSep = pSep->mpNextSep; |