diff options
| author | Mayank Gupta <techfreakworm@gmail.com> | 2016-03-30 11:47:01 +0530 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-06-09 09:54:55 +0000 |
| commit | 248c5ea771255b54e64394458a321ccf829bbd02 (patch) | |
| tree | 62e1a344fe05e5bde6e0119a7395d10c8d64a7d1 /oox | |
| parent | a97b392879c96145701b2454b26dc0c4f6aa4bb2 (diff) | |
Slideshow: Add 'Oval' Shape Transition variant
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 'oox')
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 11 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 9ae715fa49c0..49e24cf679b3 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -371,6 +371,17 @@ 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 9b29653e98e6..957d02569c2a 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -125,6 +125,13 @@ 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 ): |