diff options
author | jan iversen <jani@documentfoundation.org> | 2016-06-09 15:23:06 +0000 |
---|---|---|
committer | jan iversen <jani@documentfoundation.org> | 2016-06-09 15:25:23 +0000 |
commit | 4bcb4774a331cbe7edbb8d92bc6b628e79eee9a6 (patch) | |
tree | 309f569854f45516066817339a334a5472ae8a21 /officecfg | |
parent | d6a6f587a852ba5c993c658b6b6432a65207f5b7 (diff) |
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>
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu index 23824c1fd56a..765a0d51d3c9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu @@ -50,11 +50,6 @@ <value xml:lang="en-US">Circle</value> </prop> </node> - <node oor:name="ooo-entrance-oval" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Oval Vertical</value> - </prop> - </node> <node oor:name="ooo-entrance-fly-in-slow" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Fly in Slow</value> @@ -1733,16 +1728,6 @@ <value xml:lang="en-US">Circle</value> </prop> </node> - <node oor:name="oval-horizontal" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Oval Horizontal</value> - </prop> - </node> - <node oor:name="oval-vertical" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Oval Vertical</value> - </prop> - </node> <node oor:name="diamond" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Diamond</value> @@ -2066,22 +2051,6 @@ <value>circle</value> </prop> </node> - <node oor:name="shape-oval-horizontal" oor:op="replace"> - <prop oor:name="Set" oor:type="xs:string"> - <value>shape</value> - </prop> - <prop oor:name="Variant" oor:type="xs:string"> - <value>oval-horizontal</value> - </prop> - </node> - <node oor:name="shape-oval-vertical" oor:op="replace"> - <prop oor:name="Set" oor:type="xs:string"> - <value>shape</value> - </prop> - <prop oor:name="Variant" oor:type="xs:string"> - <value>oval-vertical</value> - </prop> - </node> <node oor:name="shape-diamond" oor:op="replace"> <prop oor:name="Set" oor:type="xs:string"> <value>shape</value> @@ -2414,7 +2383,7 @@ <value xml:lang="en-US">Basic</value> </prop> <prop oor:name="Effects" oor:type="oor:string-list"> - <value oor:separator=";">ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-oval;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random</value> + <value oor:separator=";">ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random</value> </prop> </node> <node oor:name="special" oor:op="replace"> |