[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Thorsten Behrens]

 vcl/source/gdi/mapmod.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cbac26485f1456b70c51969a1df11bf08643d894
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Nov 15 04:11:08 2016 +0100

    fix tdf#101832 and tdf#100617
    
    OutDev mapmode takes shortcuts for 'simple' mappings, so clear that flag
    once we set scale/origin away from defaults.
    
    Change-Id: I00321e27322d9cb8b86e6cc8400f6396d03328cc
    Reviewed-on: https://gerrit.libreoffice.org/30855
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5d1a788468ef94cd1de4400d3c1e38d768f7bf8d)
    Reviewed-on: https://gerrit.libreoffice.org/30876
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 70b2065..7d304be 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -115,18 +115,21 @@ void MapMode::SetMapUnit( MapUnit eUnit )
 void MapMode::SetOrigin( const Point& rLogicOrg )
 {
     mpImplMapMode->maOrigin = rLogicOrg;
+    mpImplMapMode->mbSimple = false;
 }
 
 void MapMode::SetScaleX( const Fraction& rScaleX )
 {
     mpImplMapMode->maScaleX = rScaleX;
     mpImplMapMode->maScaleX.ReduceInaccurate(32);
+    mpImplMapMode->mbSimple = false;
 }
 
 void MapMode::SetScaleY( const Fraction& rScaleY )
 {
     mpImplMapMode->maScaleY = rScaleY;
     mpImplMapMode->maScaleY.ReduceInaccurate(32);
+    mpImplMapMode->mbSimple = false;
 }
 
 double MapMode::GetUnitMultiplier() const