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

[Bartosz Kosiorek]

 drawinglayer/source/tools/emfphelperdata.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 2796b7e298b7c536a87fdf9502e1a6093a041e93
Author: Bartosz Kosiorek <gang65 at poczta.onet.pl>
Date:   Tue Nov 14 00:10:47 2017 +0100

    tdf#113758 EMF+ Add mapping of clipped region to the world space.
    
        OffsetClip record applies a translation transform
        on the current clipping region for the world space.
    
    Change-Id: I5d23f6aac944e4f23ea7c51e47fb551a20166446
    Reviewed-on: https://gerrit.libreoffice.org/44699
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mark Page <aptitude at btconnect.com>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index a1cdab8559d5..6d9a8a499f8c 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1593,13 +1593,20 @@ namespace emfplushelper
 
                         basegfx::B2DPolyPolygon aPolyPolygon(
                                     mrPropertyHolders.Current().getClipPolyPolygon());
+
+                        SAL_INFO("drawinglayer",
+                                 "EMF+\t PolyPolygon before translate: " << aPolyPolygon);
+
+                        basegfx::B2DPoint aOffset = Map(dx, dy);
                         basegfx::B2DHomMatrix transformMatrix;
-                        transformMatrix.set(0, 2, dx);
-                        transformMatrix.set(1, 2, dy);
+                        transformMatrix.set(0, 2, aOffset.getX());
+                        transformMatrix.set(1, 2, aOffset.getY());
                         aPolyPolygon.transform(transformMatrix);
 
+                        SAL_INFO("drawinglayer",
+                                 "EMF+\t PolyPolygon after translate: " << aPolyPolygon <<
+                                 ", mapped offset x" << aOffset.getX() << ", mapped offset y" << aOffset.getY());
                         HandleNewClipRegion(aPolyPolygon, mrTargetHolders, mrPropertyHolders);
-
                         break;
                     }
                     case EmfPlusRecordTypeDrawDriverString: