summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-13 10:10:17 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-13 10:15:08 +0100
commitf6ef7e33b034d4ee5fb85ae4b72d8d255fbed2b6 (patch)
tree7b380ff59088c930d26432f015991975db1819b9 /oox
parent1c482cb54b4dab4c5b549ecd2395104f042e4101 (diff)
slideshow: add "glitter" slide transition
Change-Id: Ie89b64c4399cd0092eee579660c9fe85f8ca8e73
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/slidetransition.cxx4
-rw-r--r--oox/source/ppt/slidetransitioncontext.cxx1
2 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 0fe0b10a6fec..e5e87c9e6d72 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -413,6 +413,10 @@ namespace oox { namespace ppt {
mnTransitionType = TransitionType::MISCSHAPEWIPE;
mnTransitionSubType = TransitionSubType::HORIZONTAL;
break;
+ case P14_TOKEN(glitter):
+ mnTransitionType = TransitionType::MISCSHAPEWIPE;
+ mnTransitionSubType = TransitionSubType::DIAMOND;
+ break;
default:
mnTransitionType = 0;
break;
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index a5d5496fe025..0d0c783d28f6 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -131,6 +131,7 @@ SlideTransitionContext::~SlideTransitionContext() throw()
case PPT_TOKEN( wedge ):
case P14_TOKEN( vortex ):
case P14_TOKEN( ripple ):
+ case P14_TOKEN( glitter ):
// CT_Empty
if (!mbHasTransition)
{