diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-11-17 10:49:01 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-11-18 23:36:09 +0100 |
| commit | 63bd6ee2c49f2d0c77c542778fc43ad476f6451b (patch) | |
| tree | f15714aa7f5b89962f1de5f40070e537f6eb2c9e | |
| parent | 2caec93c4ac13d6bb691c50cc36c5150f21d6364 (diff) | |
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@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
| -rw-r--r-- | drawinglayer/source/tools/emfphelperdata.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |