summaryrefslogtreecommitdiff
path: root/oox/source/ppt
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-09 13:32:32 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-09 13:36:20 +0100
commit18cd4b273f3781620ecb8dd68e6d616bba498992 (patch)
tree481297ff54232cdf90a23ca42df4c651c8ad0726 /oox/source/ppt
parent9d3cb71115cfb34adde975f66f394303982f85be (diff)
pptx: "fall" transition, which needed p15 namespace
Added p15 namespace which is present in MSO 2013+ documents. It adds a "prstTrans" element with a string "prst" attribute which is a name of the transition to be performed. This was added to support "fall" transition which translates to "fallOver" preset transition. Change-Id: I429bb106a12c1b99cce756502508e917720daef3
Diffstat (limited to 'oox/source/ppt')
-rw-r--r--oox/source/ppt/slidetransition.cxx13
-rw-r--r--oox/source/ppt/slidetransitioncontext.cxx8
2 files changed, 21 insertions, 0 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index e623558f1962..6681447b2eb2 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -419,6 +419,19 @@ namespace oox { namespace ppt {
}
}
+ void SlideTransition::setPresetTransition(OUString sPresetTransition)
+ {
+ if (sPresetTransition == "fallOver")
+ {
+ mnTransitionType = TransitionType::MISCSHAPEWIPE;
+ mnTransitionSubType = TransitionSubType::LEFTTORIGHT;
+ }
+ else
+ {
+ mnTransitionType = 0;
+ }
+ }
+
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index 4a9c996d695b..a5d5496fe025 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -152,6 +152,14 @@ SlideTransitionContext::~SlideTransitionContext() throw()
maTransition.setOoxTransitionType(aElementToken, sal_Int32(rAttribs.getBool(XML_isInverted, false)), 0);
}
return this;
+ case P15_TOKEN(prstTrans):
+ if (!mbHasTransition)
+ {
+ mbHasTransition = true;
+ maTransition.setPresetTransition(rAttribs.getString(XML_prst, ""));
+ }
+ return this;
+
default:
break;