summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-25 20:16:26 +0200
committerNoel Grandin <noel@peralex.com>2014-09-26 15:27:17 +0200
commit04fd62096fca2c0b917ac6172104399e65933585 (patch)
tree3e1d4e9c8b9aed6b308103c5e235f71ec3b2cce1 /filter
parent5501c8d2220ee3cab703d09d348e99ba3e017dba (diff)
remove unnecessary casts in calls to SvStream.WriteInt32
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I0c0172519479be0535a447e41a592fbf782751bd
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/eos2met/eos2met.cxx14
-rw-r--r--filter/source/msfilter/escherex.cxx28
-rw-r--r--filter/source/msfilter/msdffimp.cxx14
3 files changed, 28 insertions, 28 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 40104114550e..d93246141aff 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -358,8 +358,8 @@ void METWriter::WritePoint(Point aPt)
{
Point aNewPt = OutputDevice::LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
- pMET->WriteInt32( (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) )
- .WriteInt32( (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ) );
+ pMET->WriteInt32( ( aNewPt.X() - aPictureRect.Left() ) )
+ .WriteInt32( ( aPictureRect.Bottom() - aNewPt.Y() ) );
}
@@ -1353,7 +1353,7 @@ void METWriter::METFullArc(Point aCenter, double fMultiplier)
WillWriteOrder(14);
pMET->WriteUChar( 0xc7 ).WriteUChar( 12 );
WritePoint(aCenter);
- pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) );
+ pMET->WriteInt32( (fMultiplier*65536.0+0.5) );
}
@@ -1369,9 +1369,9 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier,
WillWriteOrder(22);
pMET->WriteUChar( 0xa3 ).WriteUChar( 20 );
WritePoint(aCenter);
- pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) );
- pMET->WriteInt32( (sal_Int32)(fStartAngle*65536.0+0.5) );
- pMET->WriteInt32( (sal_Int32)(fSweepAngle*65536.0+0.5) );
+ pMET->WriteInt32( (fMultiplier*65536.0+0.5) );
+ pMET->WriteInt32( (fStartAngle*65536.0+0.5) );
+ pMET->WriteInt32( (fSweepAngle*65536.0+0.5) );
}
@@ -1450,7 +1450,7 @@ void METWriter::METSetChrCellSize(Size aSize)
aMETChrCellSize=aSize;
WillWriteOrder(10);
if (aSize.Width()==0) aSize.Width()=aSize.Height();
- pMET->WriteUChar( 0x33 ).WriteUChar( 8 ).WriteInt32( (sal_Int32)aSize.Width() ).WriteInt32( (sal_Int32)aSize.Height() );
+ pMET->WriteUChar( 0x33 ).WriteUChar( 8 ).WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() );
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index f4a297dd3cfa..522e9b669775 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4549,8 +4549,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
nHeight = aPrefSize.Height() * 360;
}
rPicOutStrm.WriteUInt32( nUncompressedSize ) // WMFSize without FileHeader
- .WriteInt32( (sal_Int32)0 ) // since we can't find out anymore what the original size of
- .WriteInt32( (sal_Int32)0 ) // the WMF (without Fileheader) was we write 10cm / x
+ .WriteInt32( 0 ) // since we can't find out anymore what the original size of
+ .WriteInt32( 0 ) // the WMF (without Fileheader) was we write 10cm / x
.WriteUInt32( nPrefWidth )
.WriteUInt32( nPrefHeight )
.WriteUInt32( nWidth )
@@ -5359,10 +5359,10 @@ void EscherEx::AddAtom( sal_uInt32 nAtomSize, sal_uInt16 nRecType, int nRecVersi
void EscherEx::AddChildAnchor( const Rectangle& rRect )
{
AddAtom( 16, ESCHER_ChildAnchor );
- mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() )
- .WriteInt32( (sal_Int32)rRect.Top() )
- .WriteInt32( (sal_Int32)rRect.Right() )
- .WriteInt32( (sal_Int32)rRect.Bottom() );
+ mpOutStrm ->WriteInt32( rRect.Left() )
+ .WriteInt32( rRect.Top() )
+ .WriteInt32( rRect.Right() )
+ .WriteInt32( rRect.Bottom() );
}
void EscherEx::AddClientAnchor( const Rectangle& rRect )
@@ -5390,10 +5390,10 @@ sal_uInt32 EscherEx::EnterGroup( const OUString& rShapeName, const Rectangle* pB
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel,
mpOutStrm->Tell() );
- mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // Bounding box for the grouped shapes to which they will be attached
- .WriteInt32( (sal_Int32)aRect.Top() )
- .WriteInt32( (sal_Int32)aRect.Right() )
- .WriteInt32( (sal_Int32)aRect.Bottom() );
+ mpOutStrm ->WriteInt32( aRect.Left() ) // Bounding box for the grouped shapes to which they will be attached
+ .WriteInt32( aRect.Top() )
+ .WriteInt32( aRect.Right() )
+ .WriteInt32( aRect.Bottom() );
sal_uInt32 nShapeId = GenerateShapeId();
if ( !mnGroupLevel )
@@ -5440,10 +5440,10 @@ bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect
sal_uInt32 nCurrentPos = mpOutStrm->Tell();
if ( DoSeek( ESCHER_Persist_Grouping_Snap | ( nGroupLevel - 1 ) ) )
{
- mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() ) // Bounding box for the grouped shapes to which they will be attached
- .WriteInt32( (sal_Int32)rRect.Top() )
- .WriteInt32( (sal_Int32)rRect.Right() )
- .WriteInt32( (sal_Int32)rRect.Bottom() );
+ mpOutStrm ->WriteInt32( rRect.Left() ) // Bounding box for the grouped shapes to which they will be attached
+ .WriteInt32( rRect.Top() )
+ .WriteInt32( rRect.Right() )
+ .WriteInt32( rRect.Bottom() );
mpOutStrm->Seek( nCurrentPos );
}
}
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index d7b3c290e59e..9811a746f2ee 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -154,17 +154,17 @@ static sal_uInt32 nMSOleObjCntr = 0;
void Impl_OlePres::Write( SvStream & rStm )
{
WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE );
- rStm.WriteInt32( (sal_Int32)(nJobLen +4) ); // a TargetDevice that's always empty
+ rStm.WriteInt32( (nJobLen +4) ); // a TargetDevice that's always empty
if( nJobLen )
rStm.Write( pJob, nJobLen );
rStm.WriteUInt32( (sal_uInt32)nAspect );
- rStm.WriteInt32( (sal_Int32)-1 ); //L-Index always -1
- rStm.WriteInt32( (sal_Int32)nAdvFlags );
- rStm.WriteInt32( (sal_Int32)0 ); //Compression
- rStm.WriteInt32( (sal_Int32)aSize.Width() );
- rStm.WriteInt32( (sal_Int32)aSize.Height() );
+ rStm.WriteInt32( -1 ); //L-Index always -1
+ rStm.WriteInt32( nAdvFlags );
+ rStm.WriteInt32( 0 ); //Compression
+ rStm.WriteInt32( aSize.Width() );
+ rStm.WriteInt32( aSize.Height() );
sal_uLong nPos = rStm.Tell();
- rStm.WriteInt32( (sal_Int32)0 );
+ rStm.WriteInt32( 0 );
if( GetFormat() == FORMAT_GDIMETAFILE && pMtf )
{