summaryrefslogtreecommitdiff
path: root/oox/source/ppt/slidetransition.cxx
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2010-10-08 14:02:37 +0200
committerRadek Doulik <rodo@novell.com>2010-10-08 14:02:37 +0200
commitff19ebe0dcaa52ae8b87b4cea3de143031a041c7 (patch)
tree94c77417808350e4cdf771c1f8d1883f943d1d63 /oox/source/ppt/slidetransition.cxx
parente4b13897f5bd03a1782654d32951b0fbd5ad216e (diff)
oox-pptx-fix-transition-auto-advance.diff: import transition auto advance.
n#480243
Diffstat (limited to 'oox/source/ppt/slidetransition.cxx')
-rw-r--r--oox/source/ppt/slidetransition.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index ee889e13d840..b72f6599b4f0 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -56,6 +56,7 @@ namespace oox { namespace ppt {
, mnAnimationSpeed( AnimationSpeed_FAST )
, mnFadeColor( 0 )
, mbMode( true )
+ , mnAdvanceTime( -1 )
{
}
@@ -68,6 +69,7 @@ namespace oox { namespace ppt {
, mnAnimationSpeed( AnimationSpeed_FAST )
, mnFadeColor( 0 )
, mbMode( true )
+ , mnAdvanceTime( -1 )
{
const transition *p = transition::find( sFilterName );
if( p )
@@ -88,6 +90,10 @@ namespace oox { namespace ppt {
aProps[ PROP_TransitionDirection ] <<= mbTransitionDirectionNormal;
aProps[ PROP_Speed ] <<= mnAnimationSpeed;
aProps[ PROP_TransitionFadeColor ] <<= mnFadeColor;
+ if( mnAdvanceTime != -1 ) {
+ aProps[ PROP_Duration ] <<= mnAdvanceTime/1000;
+ aProps[ PROP_Change ] <<= static_cast<sal_Int32>(1);
+ }
}
catch( Exception& )
{
@@ -138,8 +144,6 @@ namespace oox { namespace ppt {
}
}
-
-
sal_Int16 SlideTransition::ooxToOdpEightDirections( ::sal_Int32 nOoxType )
{
sal_Int16 nOdpDirection;