From 186b4ebc99a2e80740fee51f9d0276886a003617 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 30 Jan 2014 13:46:42 +0200 Subject: convert specialised SvStream::operator>> methods to ReadXXX methods as preparation for converting the SvStream::operator>> methods on primitive types Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9 Reviewed-on: https://gerrit.libreoffice.org/7798 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- cppcanvas/source/inc/implrenderer.hxx | 2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 12 ++++++------ cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index d09ed1c1f62f..1d76ed703f45 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -147,7 +147,7 @@ static float GetSwapFloat( SvStream& rSt ) } #endif - friend SvStream& operator>>( SvStream& rIn, XForm& rXForm ) + friend SvStream& ReadXForm( SvStream& rIn, XForm& rXForm ) { if ( sizeof( float ) != 4 ) { diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 0160a4ddfff6..48e0cd36dd96 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -479,7 +479,7 @@ namespace cppcanvas if (additionalFlags & 0x02) { SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation"); - s >> transformation; + ReadXForm( s, transformation ); hasTransformation = true; SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << transformation.eM11 << " m12: " << transformation.eM12 << @@ -557,7 +557,7 @@ namespace cppcanvas if (additionalFlags & 0x02) { SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation"); - s >> transformation; + ReadXForm( s, transformation ); hasTransformation = true; SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << transformation.eM11 << " m12: " << transformation.eM12 << @@ -846,7 +846,7 @@ namespace cppcanvas " additional flags: 0x" << penFlags << " unknown: 0x" << unknown2 << " width: " << std::dec << width ); if (penFlags & 1) - s >> transformation; + ReadXForm( s, transformation ); if (penFlags & 2) { @@ -2089,7 +2089,7 @@ namespace cppcanvas case EmfPlusRecordTypeSetWorldTransform: { SAL_INFO("cppcanvas.emf", "EMF+ SetWorldTransform"); XForm transform; - rMF >> transform; + ReadXForm( rMF, transform ); aWorldTransform.Set (transform); SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << aWorldTransform.eM11 << "\tm12: " << aWorldTransform.eM12 << @@ -2104,7 +2104,7 @@ namespace cppcanvas case EmfPlusRecordTypeMultiplyWorldTransform: { SAL_INFO("cppcanvas.emf", "EMF+ MultiplyWorldTransform"); XForm transform; - rMF >> transform; + ReadXForm( rMF, transform ); SAL_INFO("cppcanvas.emf", "EMF+\tmatrix m11: " << transform.eM11 << "m12: " << transform.eM12 << @@ -2209,7 +2209,7 @@ namespace cppcanvas XForm transform; if( hasMatrix ) { - rMF >> transform; + ReadXForm( rMF, transform ); SAL_INFO("cppcanvas.emf", "EMF+\tmatrix: " << transform.eM11 << ", " << transform.eM12 << ", " << transform.eM21 << ", " << transform.eM22 << ", " << transform.eDx << ", " << transform.eDy); } diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9b65a41b416f..d5ec5425ccae 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1661,7 +1661,7 @@ namespace cppcanvas SvMemoryStream aMemStm( (void*)pData, pAct->GetDataSize(), STREAM_READ ); SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); // TODO(P2): Also handle gradients and // hatches like this @@ -1792,7 +1792,7 @@ namespace cppcanvas rMF >> nPixX >> nPixY >> nMmX >> nMmY; SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY); - rMF >> aBaseTransform; + ReadXForm( rMF, aBaseTransform ); //aWorldTransform.Set (aBaseTransform); } } -- cgit