[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/salgdilayout.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit e53a3828e5fc5d71c90f66ae46db7090c6dea368
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 26 14:47:34 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 26 21:03:35 2020 +0100

    with SAL_RTL_ENABLED=1 calc tabbar arrows are rendered reversed
    
    in...
    
    commit 6a54960f6b38a7d549ed33419cf55f4e718cf7b9
    Date:   Fri Jul 17 17:04:27 2020 +0100
    
        tdf#134085 DrawTransformedBitmap in wrong place for RTL
    
        The return of mirror wasn't used, so no effort at a rtl mirror
        was made anyway.
    
    I confidently claimed that "we don't want to mirror polygons", and we
    definitely don't want to mirror images which was the immediately obvious
    problem there. It was also the case that the highlight polygons drawn
    there were missing entirely and the changes improved matters and put
    those polygons at the correct position.
    
    But it does seem that we *do* want to mirror polygons. Since...
    
    commit 4deadc3c78949c18bb886eb1f66caa8f3cd7a2df
    Date:   Fri Sep 25 13:30:11 2020 +0200
    
        disentangle AA and B2D use in VCL drawing
    
    this path has become more used and makes it obvious that the triangles
    in the tabbar buttons are reversed since the second commit.
    
    Change-Id: Id709b2abff04c609a3c644530bcdb60c83a82942
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106682
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 5878ebdd8e73..89089d9755a2 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -469,12 +469,8 @@ bool SalGraphics::DrawPolyPolygon(
         const basegfx::B2DHomMatrix& rMirror(getMirror(i_pOutDev));
         if(!rMirror.isIdentity())
         {
-            basegfx::B2DRange aBoundingBox(i_rPolyPolygon.getB2DRange());
-            aBoundingBox *= rObjectToDevice;
-            auto aTranslateToMirroredBounds = createTranslateToMirroredBounds(aBoundingBox, rMirror);
-
             return drawPolyPolygon(
-                aTranslateToMirroredBounds * rObjectToDevice,
+                rMirror * rObjectToDevice,
                 i_rPolyPolygon,
                 i_fTransparency);
         }
@@ -558,12 +554,8 @@ bool SalGraphics::DrawPolyLine(
         const basegfx::B2DHomMatrix& rMirror(getMirror(i_pOutDev));
         if(!rMirror.isIdentity())
         {
-            basegfx::B2DRange aBoundingBox(i_rPolygon.getB2DRange());
-            aBoundingBox *= rObjectToDevice;
-            auto aTranslateToMirroredBounds = createTranslateToMirroredBounds(aBoundingBox, rMirror);
-
             return drawPolyLine(
-                aTranslateToMirroredBounds * rObjectToDevice,
+                rMirror * rObjectToDevice,
                 i_rPolygon,
                 i_fTransparency,
                 i_rLineWidth,