[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - slideshow/source

[Michael Stahl]

 slideshow/source/engine/shapes/drawshape.cxx |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit da85e5327844ec525e08fbb012389b8e90744bcf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Mar 7 12:35:23 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit cbc114a8d86d94743562c2eec7a8eef23d2d2297)
    Reviewed-on: https://gerrit.libreoffice.org/50930
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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);