diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-07 12:57:44 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-08 19:39:15 +0100 |
| commit | 9e428d1bb35a5cfa89d21fe8a47ea30b1a53fc4e (patch) | |
| tree | 4d43b86218cd6516b5d3cf63bca09b60394db270 /oox | |
| parent | 2ac998ff87da438770508fcfa034b56812f9013b (diff) | |
pptx: import outside/insde turning cube transition
Change-Id: I12f668aca158a8c868ecaeb37f6724852308a515
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 7 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 4380bbd054c6..2c130dd120ac 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -398,6 +398,13 @@ namespace oox { namespace ppt { mnTransitionType = TransitionType::ZOOM; mnTransitionSubType = TransitionSubType::DEFAULT; break; + case P14_TOKEN(prism): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + if (param1) + mnTransitionSubType = TransitionSubType::CORNERSIN; + else + mnTransitionSubType = TransitionSubType::CORNERSOUT; + break; default: mnTransitionType = 0; break; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index c34c44736c6e..78d7825eecb6 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -142,6 +142,15 @@ SlideTransitionContext::~SlideTransitionContext() throw() return new SoundActionContext ( *this, maSlideProperties ); case PPT_TOKEN( extLst ): // CT_OfficeArtExtensionList return this; + + case P14_TOKEN(prism): + if (!mbHasTransition) + { + mbHasTransition = true; + maTransition.setOoxTransitionType(aElementToken, sal_Int32(rAttribs.getBool(XML_isInverted, false)), 0); + } + return this; + default: break; } |