Remove inline SCM comments and unused parameters.

Change-Id: I5c123a924697c14f3c2a44b357ef4bd22ce7a51d

4 files changed, 2 insertions, 31 deletions

diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 8f443059e3b1..185b54ebce47 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -232,11 +232,6 @@ namespace slideshow
                                       "PathAnimation::PathAnimation(): failed to parse SVG:d path" );
                     ENSURE_OR_THROW( aPolyPoly.count() == 1,
                                       "PathAnimation::PathAnimation(): motion path consists of multiple/zero polygon(s)" );
-
-                    // TODO(F2): Since getPositionRelative() currently
-                    // cannot handle beziers, have to subdivide.
-                    // AW: Should be no longer necessary; getPositionRelative is now bezier-safe
-                    maPathPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aPolyPoly.getB2DPolygon(0) );
                 }
 
                 ~PathAnimation()
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 0a0061174488..8a6bf536d8fe 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -115,24 +115,17 @@ typedef std::vector< SpriteEntry > SpriteVector;
     @return the view clip polygon, in view coordinates, which is
     guaranteed to at least clip to the view size.
  */
-basegfx::B2DPolyPolygon createClipPolygon( const basegfx::B2DPolyPolygon&            rClip,
-                                           const uno::Reference<rendering::XCanvas>& /*rCanvas*/,
-                                           const basegfx::B2DSize&                   rUserSize )
+basegfx::B2DPolyPolygon createClipPolygon( const basegfx::B2DPolyPolygon& rClip,
+                                           const basegfx::B2DSize&        rUserSize )
 {
     // setup canvas clipping
     // =====================
 
-    // AW: Simplified
     const basegfx::B2DRange aClipRange(0, 0, rUserSize.getX(), rUserSize.getY());
-
     if(rClip.count())
-    {
         return basegfx::tools::clipPolyPolygonOnRange(rClip, aClipRange, true, false);
-    }
     else
-    {
         return basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(aClipRange));
-    }
 }
 
 /** Prepare given clip polygon to be stored as the current clip
@@ -146,11 +139,6 @@ basegfx::B2DPolyPolygon prepareClip( const basegfx::B2DPolyPolygon& rClip )
 {
     basegfx::B2DPolyPolygon aClip( rClip );
 
-    // TODO(P2): unnecessary, once XCanvas is correctly handling this
-    // AW: Should be no longer necessary; tools are now bezier-safe
-    if( aClip.areControlPointsUsed() )
-        aClip = basegfx::tools::adaptiveSubdivideByAngle( aClip );
-
     // normalize polygon, preparation for clipping
     // in updateCanvas()
     aClip = basegfx::tools::correctOrientations(aClip);
@@ -1142,7 +1130,6 @@ void SlideView::updateCanvas()
     mpCanvas->setTransformation( getTransformation() );
     mpCanvas->setClip(
         createClipPolygon( maClip,
-                           mpCanvas,
                            maUserSize ));
 #endif
 
@@ -1163,7 +1150,6 @@ void SlideView::updateClip()
     // TODO-NYI
     mpCanvas->setClip(
         createClipPolygon( maClip,
-                           mpCanvas,
                            maUserSize ));
 #endif
     pruneLayers( false );
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index a8c912f3d272..b6ed4e8f6384 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -53,13 +53,6 @@ namespace slideshow
             // poly-polygon with the minuent - i.e. choose the
             // polygon to subtract from sufficiently large.
 
-            // blow up unit rect to (-1,-1),(2,2)
-            // AW: Not needed, just use range
-            // ::basegfx::B2DHomMatrix aMatrix;
-            // aMatrix.scale(3.0,3.0);
-            // aMatrix.translate(-1.0,-1.0);
-            // maBackgroundRect.transform( aMatrix );
-
             // extract modification info from maTransitionInfo
             // -----------------------------------------------
 
@@ -175,7 +168,6 @@ namespace slideshow
                 // calc maBackgroundRect \ aClipPoly
                 // =================================
 
-                // AW: Simplified
                 // use a range with fixed size (-1,-1),(2,2)
                 const basegfx::B2DRange aBackgroundRange(-1, -1, 2, 2);
                 const basegfx::B2DRange aClipPolyRange(aClipPoly.getB2DRange());
diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx
index ceba88aad277..01c6e994c925 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.hxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.hxx
@@ -73,8 +73,6 @@ namespace slideshow
         private:
             ParametricPolyPolygonSharedPtr     mpParametricPoly;
             ::basegfx::B2DHomMatrix            maStaticTransformation;
-            // AW: Not needed
-            // ::basegfx::B2DPolyPolygon          maBackgroundRect;
             bool                               mbForwardParameterSweep;
             bool                               mbSubtractPolygon;
             const bool                         mbScaleIsotrophically;