From 0408a590311c837d5f0ab1abfb72a564a266ddac Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 7 Mar 2018 12:35:23 +0100 Subject: tdf#115142 Revert "slideshow: clip shapes in secondary screen window" This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90. This is bogus as it actually does scaling and not clipping, and the actual clipping bug is in the VCL canvas, see following commit. Also should fix tdf#115652 and tdf#116196. Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882 --- slideshow/source/engine/shapes/drawshape.cxx | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index c023119ded06..00a8894f5ef0 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -133,26 +133,11 @@ namespace slideshow ViewShape::RenderArgs DrawShape::getViewRenderArgs() const { - uno::Reference const xPropSet(mxPage, - uno::UNO_QUERY_THROW); - sal_Int32 nWidth = 0; - sal_Int32 nHeight = 0; - xPropSet->getPropertyValue("Width") >>= nWidth; - xPropSet->getPropertyValue("Height") >>= nHeight; - basegfx::B2DRectangle slideRect(0, 0, nWidth, nHeight); - basegfx::B2DRectangle origBounds(maBounds); - origBounds.intersect(slideRect); - basegfx::B2DRectangle updateBounds(getUpdateArea()); - updateBounds.intersect(slideRect); - basegfx::B2DRectangle bounds(getBounds()); - bounds.intersect(slideRect); - basegfx::B2DRectangle unitBounds(getActualUnitShapeBounds()); - unitBounds.intersect(slideRect); return ViewShape::RenderArgs( - origBounds, - updateBounds, - bounds, - unitBounds, + maBounds, + getUpdateArea(), + getBounds(), + getActualUnitShapeBounds(), mpAttributeLayer, maSubsetting.getActiveSubsets(), mnPriority); -- cgit