summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-03-07 12:35:23 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-03-07 22:21:15 +0100
commitcbc114a8d86d94743562c2eec7a8eef23d2d2297 (patch)
tree7472471ff89cf4e5da9978c554cb7756097e3a29
parentc59c43ecfb7b858557c82bb3733ba72f0f23d3df (diff)
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 (cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac) Reviewed-on: https://gerrit.libreoffice.org/50887 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx23
1 files changed, 4 insertions, 19 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index b1dc56b62741..98f1cae40ac7 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -134,26 +134,11 @@ namespace slideshow
ViewShape::RenderArgs DrawShape::getViewRenderArgs() const
{
- uno::Reference<beans::XPropertySet> 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);