From f387c5da5a824df6cf2874155c13445a86804475 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 12 Jun 2013 07:03:16 +0200 Subject: Pass also the bounding box in device units to the EMF+ part Change-Id: I71d3029d4b3aafdc44d82b0bd9db9a54f9b8b81f --- cppcanvas/source/inc/implrenderer.hxx | 4 ++++ cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 ++ 2 files changed, 6 insertions(+) (limited to 'cppcanvas') diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 79a2967f88d6..ae47ab806191 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -295,6 +295,10 @@ static float GetSwapFloat( SvStream& rSt ) sal_Int32 nHDPI; sal_Int32 nVDPI; /* EMF+ emf header info */ + sal_Int32 nBoundsLeft; + sal_Int32 nBoundsTop; + sal_Int32 nBoundsRight; + sal_Int32 nBoundsBottom; sal_Int32 nFrameLeft; sal_Int32 nFrameTop; sal_Int32 nFrameRight; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 85a5cef24b38..ca217d117a5b 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1867,6 +1867,8 @@ namespace cppcanvas SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ); + rMF >> nBoundsLeft >> nBoundsTop >> nBoundsRight >> nBoundsBottom; + SAL_INFO ("cppcanvas.emf", "EMF+ picture bounds: " << nBoundsLeft << "," << nBoundsTop << " - " << nBoundsRight << "," << nBoundsBottom); rMF >> nFrameLeft >> nFrameTop >> nFrameRight >> nFrameBottom; SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom); rMF >> nPixX >> nPixY >> nMmX >> nMmY; -- cgit v1.2.3