From d46b16e1e495c153f70633d2da5c2bb0aba85cc9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 25 Sep 2014 05:27:36 +0200 Subject: remove unnecessary casts's left over from our conversion of the SvStream output operators to more specific methods Change-Id: I63f18be8e940098c2acbbc73ee49ede3a949fcb2 --- svtools/source/graphic/grfattr.cxx | 8 ++++---- svtools/source/misc/transfer.cxx | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'svtools') diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index c53c056885b6..a24042708046 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -111,10 +111,10 @@ SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ) rOStm.WriteInt16( rAttr.mnContPercent ).WriteInt16( rAttr.mnLumPercent ).WriteInt16( rAttr.mnRPercent ).WriteInt16( rAttr.mnGPercent ).WriteInt16( rAttr.mnBPercent ); rOStm.WriteUChar( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( (sal_uInt16) rAttr.meDrawMode ); //#fdo39428 SvStream no longer supports operator<<(long) - rOStm.WriteInt32( sal::static_int_cast(rAttr.mnLeftCrop) ) - .WriteInt32( sal::static_int_cast(rAttr.mnTopCrop) ) - .WriteInt32( sal::static_int_cast(rAttr.mnRightCrop) ) - .WriteInt32( sal::static_int_cast(rAttr.mnBottomCrop) ); + rOStm.WriteInt32( rAttr.mnLeftCrop ) + .WriteInt32( rAttr.mnTopCrop ) + .WriteInt32( rAttr.mnRightCrop ) + .WriteInt32( rAttr.mnBottomCrop ); return rOStm; } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 15914496e28f..7bf8f637dfba 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -87,11 +87,10 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable rOStm.SeekRel( 4 ); WriteSvGlobalName( rOStm, rObjDesc.maClassName ); rOStm.WriteUInt32( nViewAspect ); - //#fdo39428 Remove SvStream operator<<(long) - rOStm.WriteInt32( sal::static_int_cast(rObjDesc.maSize.Width()) ); - rOStm.WriteInt32( sal::static_int_cast(rObjDesc.maSize.Height()) ); - rOStm.WriteInt32( sal::static_int_cast(rObjDesc.maDragStartPos.X()) ); - rOStm.WriteInt32( sal::static_int_cast(rObjDesc.maDragStartPos.Y()) ); + rOStm.WriteInt32( rObjDesc.maSize.Width() ); + rOStm.WriteInt32( rObjDesc.maSize.Height() ); + rOStm.WriteInt32( rObjDesc.maDragStartPos.X() ); + rOStm.WriteInt32( rObjDesc.maDragStartPos.Y() ); rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm.WriteUInt32( nSig1 ).WriteUInt32( nSig2 ); -- cgit