[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Michael Meeks (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 0b99af16f0286fce9fb410c904bea32d0e510280
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Feb 26 03:59:35 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Feb 26 09:53:10 2020 +0100

    Revert "tdf#130768 need to use mnOutOffX/mnOutOffY"
    
    This reverts commit 1c62465ff27a5721fac7f60798e8d674fefdd2aa.
    
    Change-Id: I48cc7069e69b98e02b67d460f55e6cba0a3297dc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89495
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 4aba910cf599..7fe75ec21a14 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1230,10 +1230,7 @@ void OutputDevice::DrawTransformedBitmapEx(
 
     if(bAllowPreferDirectPaint && bTryDirectPaint)
     {
-        // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may
-        // be that mnOutOffX/mnOutOffY is used - see AOO bug 75163, mentioned at
-        // ImplGetDeviceTransformation declaration
-        const basegfx::B2DHomMatrix aFullTransform(ImplGetDeviceTransformation() * rTransformation);
+        const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
 
         if(DrawTransformBitmapExDirect(aFullTransform, rBitmapEx))
         {
@@ -1280,10 +1277,7 @@ void OutputDevice::DrawTransformedBitmapEx(
     // to specify order of executions, so give bTryDirectPaint a call
     if(bTryDirectPaint)
     {
-        // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may
-        // be that mnOutOffX/mnOutOffY is used - see AOO bug 75163, mentioned at
-        // ImplGetDeviceTransformation declaration
-        const basegfx::B2DHomMatrix aFullTransform(ImplGetDeviceTransformation() * rTransformation);
+        const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
 
         if(DrawTransformBitmapExDirect(aFullTransform, rBitmapEx))
         {
@@ -1322,10 +1316,7 @@ void OutputDevice::DrawTransformedBitmapEx(
     const double fOrigArea(rOriginalSizePixel.Width() * rOriginalSizePixel.Height() * 0.5);
     const double fOrigAreaScaled(fOrigArea * 1.44);
     double fMaximumArea(std::min(4500000.0, std::max(1000000.0, fOrigAreaScaled)));
-    // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may
-    // be that mnOutOffX/mnOutOffY is used - see AOO bug 75163, mentioned at
-    // ImplGetDeviceTransformation declaration
-    basegfx::B2DHomMatrix aFullTransform(ImplGetDeviceTransformation() * rTransformation);
+    basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
 
     if(!bMetafile)
     {