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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 11 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 7 |
2 files changed, 0 insertions, 18 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 49e24cf679b3..9ae715fa49c0 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -371,17 +371,6 @@ namespace oox { namespace ppt { mnTransitionType = TransitionType::ELLIPSEWIPE; mnTransitionSubType = TransitionSubType::CIRCLE; break; - case PPT_TOKEN( oval ): - mnTransitionType = TransitionType::ELLIPSEWIPE; - if( ooxToOdpDirection( param1 ) == TransitionSubType::VERTICAL ) - { - mnTransitionSubType = TransitionSubType::VERTICAL; - } - else - { - mnTransitionSubType = TransitionSubType::HORIZONTAL; - } - break; case PPT_TOKEN( diamond ): mnTransitionType = TransitionType::IRISWIPE; mnTransitionSubType = TransitionSubType::DIAMOND; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 957d02569c2a..9b29653e98e6 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -125,13 +125,6 @@ SlideTransitionContext::~SlideTransitionContext() throw() } return this; case PPT_TOKEN( circle ): - case PPT_TOKEN( oval ) : - if (!mbHasTransition) - { - mbHasTransition = true; - maTransition.setOoxTransitionType( aElementToken, rAttribs.getToken( XML_dir, XML_vert), 0); - } - return this; case PPT_TOKEN( diamond ): case PPT_TOKEN( dissolve ): case PPT_TOKEN( newsflash ): |