summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-25 06:22:44 +0200
committerNoel Grandin <noel@peralex.com>2014-09-26 15:26:48 +0200
commitdedfa972bc19f21e6fab7c38a64ae9543142f416 (patch)
tree9f568319c41402e901b8c7f4974203607135b6d8 /filter
parentremove unnecessary casts in calls to SvStream.WriteSChar (diff)
downloadcore-dedfa972bc19f21e6fab7c38a64ae9543142f416.tar.gz
core-dedfa972bc19f21e6fab7c38a64ae9543142f416.zip
remove unnecessary casts in calls to SvStream.WriteInt16
left over from our conversion of the SvStream output operators to more specific methods Change-Id: Ie44bec6b988f3e46fe78d14b740818c9141f5df0
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx16
-rw-r--r--filter/source/msfilter/escherex.cxx16
2 files changed, 16 insertions, 16 deletions
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index e3606deaa34a..a044ef414820 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -282,14 +282,14 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly)
void PictWriter::WritePoint(const Point & rPoint)
{
Point aPoint = OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode );
- pPict->WriteInt16( (short)aPoint.Y() ).WriteInt16( (short)aPoint.X() );
+ pPict->WriteInt16( aPoint.Y() ).WriteInt16( aPoint.X() );
}
void PictWriter::WriteSize(const Size & rSize)
{
OutputDevice::LogicToLogic( rSize, aSrcMapMode, aTargetMapMode ); // -Wall is this needed.
- pPict->WriteInt16( (short)rSize.Height() ).WriteInt16( (short)rSize.Width() );
+ pPict->WriteInt16( rSize.Height() ).WriteInt16( rSize.Width() );
}
@@ -327,8 +327,8 @@ Rectangle PictWriter::MapRectangle( const Rectangle& rRect )
void PictWriter::WriteRectangle(const Rectangle & rRect)
{
Rectangle aRect( MapRectangle( rRect ) );
- pPict ->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() )
- .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() );
+ pPict ->WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() )
+ .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() );
}
void PictWriter::WritePolygon(const Polygon & rPoly)
@@ -713,8 +713,8 @@ void PictWriter::WriteOpcode_ClipRect( const Rectangle& rRect )
++aRect.Right();
pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1
.WriteUInt16( (sal_uInt16)10 ) // data size
- .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() )
- .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() );
+ .WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() )
+ .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() );
aClipRect = aRect;
}
@@ -2055,8 +2055,8 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
Rectangle aRect( pAt->aClipRect );
pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1
.WriteUInt16( (sal_uInt16)10 ) // data size
- .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() )
- .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() );
+ .WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() )
+ .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() );
}
aClipRect=pAt->aClipRect;
pAttrStack=pAt->pSucc;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index e322d7f32d31..7728e1ed163f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3114,9 +3114,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
while( aIter != aEnd )
{
aOut.WriteUInt16( (sal_uInt16)aIter->nOperation )
- .WriteInt16( (sal_Int16)aIter->nPara[ 0 ] )
- .WriteInt16( (sal_Int16)aIter->nPara[ 1 ] )
- .WriteInt16( (sal_Int16)aIter->nPara[ 2 ] );
+ .WriteInt16( aIter->nPara[ 0 ] )
+ .WriteInt16( aIter->nPara[ 1 ] )
+ .WriteInt16( aIter->nPara[ 2 ] );
++aIter;
}
sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
@@ -5368,10 +5368,10 @@ void EscherEx::AddChildAnchor( const Rectangle& rRect )
void EscherEx::AddClientAnchor( const Rectangle& rRect )
{
AddAtom( 8, ESCHER_ClientAnchor );
- mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() )
- .WriteInt16( (sal_Int16)rRect.Left() )
- .WriteInt16( (sal_Int16)( rRect.GetWidth() + rRect.Left() ) )
- .WriteInt16( (sal_Int16)( rRect.GetHeight() + rRect.Top() ) );
+ mpOutStrm->WriteInt16( rRect.Top() )
+ .WriteInt16( rRect.Left() )
+ .WriteInt16( ( rRect.GetWidth() + rRect.Left() ) )
+ .WriteInt16( ( rRect.GetHeight() + rRect.Top() ) );
}
EscherExHostAppData* EscherEx::EnterAdditionalTextGroup()
@@ -5458,7 +5458,7 @@ bool EscherEx::SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect
sal_uInt32 nCurrentPos = mpOutStrm->Tell();
if ( DoSeek( ESCHER_Persist_Grouping_Logic | ( nGroupLevel - 1 ) ) )
{
- mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() ).WriteInt16( (sal_Int16)rRect.Left() ).WriteInt16( (sal_Int16)rRect.Right() ).WriteInt16( (sal_Int16)rRect.Bottom() );
+ mpOutStrm->WriteInt16( rRect.Top() ).WriteInt16( rRect.Left() ).WriteInt16( rRect.Right() ).WriteInt16( rRect.Bottom() );
mpOutStrm->Seek( nCurrentPos );
}
}