diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-18 18:26:42 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-18 18:28:04 +0100 |
commit | 59095c79787bbf9067514225b886d0c25d59e1ff (patch) | |
tree | f85da3aa7e14eadbaaf9edcaa09ef45a9a5a8d20 /oox | |
parent | slideshow: improve "honeycomb" transition (diff) | |
download | core-59095c79787bbf9067514225b886d0c25d59e1ff.tar.gz core-59095c79787bbf9067514225b886d0c25d59e1ff.zip |
pptx: import/export of honeycomb slide transition
Change-Id: I3edb77d5b046691e64d600d61dcd44e892c31301
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/ppt/slidetransition.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index e5e87c9e6d72..de883c88f165 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -417,6 +417,10 @@ namespace oox { namespace ppt { mnTransitionType = TransitionType::MISCSHAPEWIPE; mnTransitionSubType = TransitionSubType::DIAMOND; break; + case P14_TOKEN(honeycomb): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + mnTransitionSubType = TransitionSubType::HEART; + break; default: mnTransitionType = 0; break; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 0d0c783d28f6..589edb98a64a 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -132,6 +132,7 @@ SlideTransitionContext::~SlideTransitionContext() throw() case P14_TOKEN( vortex ): case P14_TOKEN( ripple ): case P14_TOKEN( glitter ): + case P14_TOKEN( honeycomb ): // CT_Empty if (!mbHasTransition) { |