From 4bcb4774a331cbe7edbb8d92bc6b628e79eee9a6 Mon Sep 17 00:00:00 2001
From: jan iversen <jani@documentfoundation.org>
Date: Thu, 9 Jun 2016 15:23:06 +0000
Subject: 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>
---
 sd/xml/effects.xml     | 16 ----------------
 sd/xml/transitions.xml |  6 ------
 2 files changed, 22 deletions(-)

(limited to 'sd/xml')

diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml
index b7789383ed27..bef5e0580b94 100644
--- a/sd/xml/effects.xml
+++ b/sd/xml/effects.xml
@@ -91,22 +91,6 @@
     </anim:par>
     <anim:par smil:begin="indefinite" smil:fill="hold">
     <anim:par smil:begin="0" smil:fill="hold">
-    <anim:par pres:preset-property="Direction" smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-oval" pres:preset-sub-type="in">
-        <anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/>
-        <anim:transitionFilter smil:dur="2" smil:type="ellipseWipe" smil:subtype="vertical" smil:direction="reverse"/>
-    </anim:par>
-    </anim:par>
-    </anim:par>
-    <anim:par smil:begin="indefinite" smil:fill="hold">
-    <anim:par smil:begin="0" smil:fill="hold">
-    <anim:par pres:preset-property="Direction" smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-oval" pres:preset-sub-type="out">
-        <anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/>
-        <anim:transitionFilter smil:dur="2" smil:type="ellipseWipe" smil:subtype="vertical"/>
-    </anim:par>
-    </anim:par>
-    </anim:par>
-    <anim:par smil:begin="indefinite" smil:fill="hold">
-    <anim:par smil:begin="0" smil:fill="hold">
     <anim:par pres:preset-property="Direction" smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-fly-in-slow" pres:preset-sub-type="from-bottom">
         <anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/>
         <anim:animate smil:dur="5" smil:fill="hold" smil:attributeName="x" smil:values="x;x" smil:keyTimes="0;1"/>
diff --git a/sd/xml/transitions.xml b/sd/xml/transitions.xml
index cefcab31cf36..8b96d7959e0e 100644
--- a/sd/xml/transitions.xml
+++ b/sd/xml/transitions.xml
@@ -107,12 +107,6 @@
  <anim:par pres:preset-id="shape-circle">
   <anim:transitionFilter smil:type="ellipseWipe" smil:subtype="circle"/>
  </anim:par>
- <anim:par pres:preset-id="shape-oval-horizontal">
-  <anim:transitionFilter smil:type="ellipseWipe" smil:subtype="horizontal"/>
- </anim:par>
- <anim:par pres:preset-id="shape-oval-vertical">
-  <anim:transitionFilter smil:type="ellipseWipe" smil:subtype="vertical"/>
- </anim:par>
 <!--  <anim:par pres:preset-id="circle-in"> -->
 <!--   <anim:transitionFilter smil:type="ellipseWipe" smil:subtype="circle" smil:direction="reverse"/> -->
 <!--  </anim:par> -->
-- 
cgit