[Libreoffice-commits] core.git: drawinglayer/source

[Bartosz Kosiorek]

 drawinglayer/source/tools/emfphelperdata.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 63bd6ee2c49f2d0c77c542778fc43ad476f6451b
Author: Bartosz Kosiorek <gang65 at poczta.onet.pl>
Date:   Fri Nov 17 10:49:01 2017 +0100

    tdf#111486 Multiply by whole base transformation, and not only by scale of it
    
    Change-Id: Ib50fa1ac36f06dbd7e5e921f9c13c5d5ac8bb138
    Reviewed-on: https://gerrit.libreoffice.org/44869
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index b9b60d021504..d3c7fbc98718 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -285,7 +285,7 @@ namespace emfplushelper
         maMapTransform = maWorldTransform;
         maMapTransform *= basegfx::utils::createScaleB2DHomMatrix(100.0 * mnMmX / mnPixX, 100.0 * mnMmY / mnPixY);
         maMapTransform *= basegfx::utils::createTranslateB2DHomMatrix(double(-mnFrameLeft), double(-mnFrameTop));
-        maMapTransform *= basegfx::utils::createScaleB2DHomMatrix(maBaseTransform.get(0, 0), maBaseTransform.get(1, 1));
+        maMapTransform *= maBaseTransform;
     }
 
     ::basegfx::B2DPoint EmfPlusHelperData::Map(double ix, double iy) const
@@ -689,6 +689,7 @@ namespace emfplushelper
         rMS.ReadInt32(mnPixX).ReadInt32(mnPixY).ReadInt32(mnMmX).ReadInt32(mnMmY);
         SAL_INFO("drawinglayer", "EMF+ ref device pixel size: " << mnPixX << "x" << mnPixY << " mm size: " << mnMmX << "x" << mnMmY);
         readXForm(rMS, maBaseTransform);
+        SAL_INFO("drawinglayer", "EMF+ base transform: " << maBaseTransform);
         mappingChanged();
     }