summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2013-05-07 18:36:01 +0200
committerThorsten Behrens <tbehrens@suse.com>2013-05-07 19:03:45 +0200
commitf444246fcb4658fbdd35fb3fbbe57320ffcaaf22 (patch)
tree841db5f4c717bc1e5187638f6efb701dd1149f73 /vcl
parentdcf11ef35fbd0012c1603b53704fa05afdb2ce7f (diff)
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
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/print2.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 5f7ccadea4d2..3111ba343f24 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -627,7 +627,14 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
}
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();
}