[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - vcl/win

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit d37d6070dd5300d249940d7f8d960ff6d4d9a036
Author:     Armin Le Grand <Armin.Le.Grand at me.com>
AuthorDate: Fri Jan 11 17:59:59 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 14 10:27:05 2019 +0100

    tdf#122384 Added isPrinter support to WinSalGraphicsImpl::drawPolyLine
    
    As already guessed but not been sure (see 'One more hint'
    in WinSalGraphicsImpl::drawPolyPolygon) the strange WinGDI
    transform is also needed when printing for WinSalGraphicsImpl::
    drawPolyLine.
    
    Change-Id: I39f89eac0c17e524949221306723a355c6e94a17
    Reviewed-on: https://gerrit.libreoffice.org/66190
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
    (cherry picked from commit 6e3c4ae8bca898700cde9caaff43c3a8a61eebc2)
    Reviewed-on: https://gerrit.libreoffice.org/66270
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5af161ebbe2a0183c1302099c995548d82965fa9)
    Reviewed-on: https://gerrit.libreoffice.org/66271
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index fa6dccb48c5a..10aad77ed229 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2310,6 +2310,21 @@ bool WinSalGraphicsImpl::drawPolyLine(
         aGraphics.SetSmoothingMode(Gdiplus::SmoothingModeNone);
     }
 
+    if(mrParent.isPrinter())
+    {
+        // tdf#122384 As metioned above in WinSalGraphicsImpl::drawPolyPolygon
+        // (look for 'One more hint: This *may* also be needed now in'...).
+        // See comments in same spot above *uregntly* before doing changes here,
+        // these comments are *still fully valid* at this place (!)
+        const Gdiplus::REAL aDpiX(aGraphics.GetDpiX());
+        const Gdiplus::REAL aDpiY(aGraphics.GetDpiY());
+
+        aGraphics.ScaleTransform(
+            Gdiplus::REAL(100.0) / aDpiX,
+            Gdiplus::REAL(100.0) / aDpiY,
+            Gdiplus::MatrixOrderAppend);
+    }
+
     aGraphics.DrawPath(
         &aPen,
         &(*pGraphicsPath));