Kaydet (Commit) 0408a590 authored tarafından Michael Stahl's avatar Michael Stahl

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd.

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
üst df4bbaec
......@@ -133,26 +133,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment