[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - drawinglayer/source

[Libreoffice Gerrit user]

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

New commits:
commit babf033fddf1d1212a268703a7dcd96214560f26
Author:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
AuthorDate: Tue Nov 27 11:44:07 2018 +0100
Commit:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
CommitDate: Tue Nov 27 11:45:28 2018 +0100

    tdf#121648 EMF+ Fix displaying DrawDriverString record
    
    With introduing String rotation support
    I made mistake by not removing Maping from DX-Array.
    With this commit I'm fixing that issue.
    Now drawing with DrawDriverString record,
    and rotation is working perfectly.
    
    Change-Id: I7ae051b3791d9d2d8e2143ed33d21b7bfbc551c6
    Reviewed-on: https://gerrit.libreoffice.org/64080
    Tested-by: Jenkins
    Reviewed-by: Patrick Jaap <patrick.jaap at tu-dresden.de>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 595fddd96af2..b729c5a6611f 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1796,10 +1796,9 @@ namespace emfplushelper
 
                                 // generate the DX-Array
                                 aDXArray.clear();
-                                double mappedPosX = Map(charsPosX[pos], charsPosY[pos]).getX();
-                                for (size_t i = 0; i < aLength-1; i++)
+                                for (size_t i = 0; i < aLength - 1; i++)
                                 {
-                                    aDXArray.push_back(Map(charsPosX[pos + i + 1], charsPosY[pos + i + 1]).getX() - mappedPosX);
+                                    aDXArray.push_back(charsPosX[pos + i + 1] - charsPosX[pos]);
                                 }
                                 // last entry
                                 aDXArray.push_back(0);