Revert "Slideshow: Add 'Oval' Shape Transition variant"

The patch caused problems with the export filter tests, to check that you need to add --with-export-validation to your autopen.input 

see https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/export-validation for more info on how to set it up

This reverts commit 248c5ea771255b54e64394458a321ccf829bbd02.

Change-Id: Ib3b8fa7bf80630feeca1f24dfb1ceb5a945d7162
Reviewed-on: https://gerrit.libreoffice.org/26114
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>

3 files changed, 9 insertions, 22 deletions

diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx
index c3dd9ccb8aaa..35aa9ec69a99 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.cxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/animations/TransitionSubType.hpp>
+
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include "ellipsewipe.hxx"
@@ -29,23 +29,12 @@ namespace internal {
 
 ::basegfx::B2DPolyPolygon EllipseWipe::operator () ( double t )
 {
-    ::basegfx::B2DPoint rCenter(0.5,0.5);
-    double fRadius = ::basegfx::pruneScaleValue( t * M_SQRT2 / 2.0 );
-
-    if( mnSubType == com::sun::star::animations::TransitionSubType::VERTICAL )
-    {
-        //oval :
-        ::basegfx::B2DPolygon poly (
-            ::basegfx::tools::createPolygonFromEllipse( rCenter, fRadius*2, fRadius ) ); //Horizontal Ellipse is rotated by 90 degress
-        return ::basegfx::B2DPolyPolygon( poly );
-    }
-    else
-    {
-         // circle:
-        ::basegfx::B2DPolygon poly(
-            ::basegfx::tools::createPolygonFromCircle( rCenter, fRadius ) );
-        return ::basegfx::B2DPolyPolygon( poly );
-    }
+    // currently only circle:
+    ::basegfx::B2DPolygon poly(
+        ::basegfx::tools::createPolygonFromCircle(
+            ::basegfx::B2DPoint( 0.5, 0.5 ),
+            ::basegfx::pruneScaleValue( t * M_SQRT2 / 2.0 ) ) );
+    return ::basegfx::B2DPolyPolygon( poly );
 }
 
 }
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx
index c8d991b509f8..d710cba27794 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -30,10 +30,8 @@ namespace internal {
 class EllipseWipe : public ParametricPolyPolygon
 {
 public:
-    explicit EllipseWipe( sal_Int32 nSubType ): mnSubType( nSubType ) {}
+    explicit EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
     virtual ::basegfx::B2DPolyPolygon operator () ( double x ) override;
-private:
-    sal_Int32 mnSubType;
 };
 
 }
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 021c3592ab61..8f10a551d219 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -699,7 +699,7 @@ static const TransitionInfo lcl_transitionInfo[] =
         1.0, // no scaling
         TransitionInfo::REVERSEMETHOD_SUBTRACT_AND_INVERT,
         true, // 'out' by parameter sweep inversion
-        true // scale isotrophically to target size
+        false // scale isotrophically to target size
     },