diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-09 10:59:32 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-09 11:00:58 +0100 |
| commit | c24fbd8c8a4f00c4eeaa97528832afa67d4af1e7 (patch) | |
| tree | bad4f6346a5aaea9c6b9c3f832687c724c0cea37 /oox | |
| parent | 733846f20c43588478d01c448f622cc9854bc59e (diff) | |
pptx: import "Vortex" and "Ripple" transition + test
Change-Id: I29d71e9c07c4964275c13772cdb6042624550acb
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 8 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 2c130dd120ac..e623558f1962 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -405,6 +405,14 @@ namespace oox { namespace ppt { else mnTransitionSubType = TransitionSubType::CORNERSOUT; break; + case P14_TOKEN(vortex): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + mnTransitionSubType = TransitionSubType::VERTICAL; + break; + case P14_TOKEN(ripple): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + mnTransitionSubType = TransitionSubType::HORIZONTAL; + break; default: mnTransitionType = 0; break; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 78d7825eecb6..4a9c996d695b 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -129,6 +129,8 @@ SlideTransitionContext::~SlideTransitionContext() throw() case PPT_TOKEN( plus ): case PPT_TOKEN( random ): case PPT_TOKEN( wedge ): + case P14_TOKEN( vortex ): + case P14_TOKEN( ripple ): // CT_Empty if (!mbHasTransition) { |