[PATCH libreoffice-4-0] Fix fdo#40421 Take current clip into account for shape bound...

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3815

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/3815/1

Fix fdo#40421 Take current clip into account for shape bounds.

Seems with the extensive drawinglayer rework, we now get bitmap
fills rendered via clip polygon and subsequent bitmap tiles. To
get the true bound rect of the current metaaction, clip it against
outdev's clip region bounds (as some reasonably cheap best-effort
approximation).

Change-Id: I4ecf04e2d94da21acc97362a1a65a965c7176077
---
M vcl/source/gdi/print2.cxx
1 file changed, 8 insertions(+), 1 deletion(-)



diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 5f7ccad..3111ba3 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -627,7 +627,14 @@
     }
 
     if( !aActionBounds.IsEmpty() )
-        return rOut.LogicToPixel( aActionBounds );
+    {
+        // fdo#40421 limit current action's output to clipped area
+        if( rOut.IsClipRegion() )
+            return rOut.LogicToPixel(
+                rOut.GetClipRegion().GetBoundRect().Intersection( aActionBounds ) );
+        else
+            return rOut.LogicToPixel( aActionBounds );
+    }
     else
         return Rectangle();
 }

-- 
To view, visit https://gerrit.libreoffice.org/3815
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ecf04e2d94da21acc97362a1a65a965c7176077
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens <tbehrens at suse.com>