Revert some random work-in-progress that is most probably bitrotten

Revert "EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it"

This reverts commit 2b700a710e44d2d09f45793f5f2448268e66d4fe.

Revert "Pass also the bounding box in device units to the EMF+ part"

This reverts commit f387c5da5a824df6cf2874155c13445a86804475.

1 files changed, 9 insertions, 7 deletions

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index ff7fc2e43902..0972dcdc6f18 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -2233,24 +2233,26 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
     EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS header info\n"));
 
     SvMemoryStream mem;
-    sal_Int32 nDevLeft, nDevRight, nDevTop, nDevBottom;
     sal_Int32 nLeft, nRight, nTop, nBottom;
 
-    nDevLeft = mrclBounds.Left();
-    nDevRight = mrclBounds.Right();
-    nDevTop = mrclBounds.Top();
-    nDevBottom = mrclBounds.Bottom();
-
     nLeft = mrclFrame.Left();
     nTop = mrclFrame.Top();
     nRight = mrclFrame.Right();
     nBottom = mrclFrame.Bottom();
 
     // emf header info
-    mem << nDevLeft << nDevTop << nDevRight << nDevBottom;
     mem << nLeft << nTop << nRight << nBottom;
     mem << mnPixX << mnPixY << mnMillX << mnMillY;
 
+    float one, zero;
+
+    one = 1;
+    zero = 0;
+
+    // add transformation matrix to be used in vcl's metaact.cxx for
+    // rotate and scale operations
+    mem << one << zero << zero << one << zero << zero;
+
     // need to flush the stream, otherwise GetEndOfData will return 0
     // on windows where the function parameters are probably resolved in reverse order
     mem.Flush();