diff options
| author | Mayank Gupta <techfreakworm@gmail.com> | 2016-03-30 11:47:01 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-10 12:14:40 +0200 |
| commit | 16ddfa21d6e92af6d2ce30a3d80f7184d3a462af (patch) | |
| tree | 73eed291a8e81c0971db0d3422b1c044843aef4e /sd/xml | |
| parent | 5cf68b0eac1a81ebcb2fa8f0e90fc4f7e350bd3a (diff) | |
Slideshow: Add 'Oval' Shape Transition variant
Committer's note: There is no Oval or Ellipse transition in MSO formats,
so fallback to circle on export to those.
Change-Id: Ibc3d617d3bb94bdd0702bb4d60ce5fbe2eea8e24
Reviewed-on: https://gerrit.libreoffice.org/23661
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'sd/xml')
| -rw-r--r-- | sd/xml/effects.xml | 16 | ||||
| -rw-r--r-- | sd/xml/transitions.xml | 6 |
2 files changed, 22 insertions, 0 deletions
diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml index bef5e0580b94..b7789383ed27 100644 --- a/sd/xml/effects.xml +++ b/sd/xml/effects.xml @@ -91,6 +91,22 @@ </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 8b96d7959e0e..cefcab31cf36 100644 --- a/sd/xml/transitions.xml +++ b/sd/xml/transitions.xml @@ -107,6 +107,12 @@ <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> --> |