From 19473fab6061b9d433e413d20390b3cf2ab5200b Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Fri, 2 Feb 2018 10:21:50 +0100 Subject: tdf#115394 import custom slide transition time in PPTX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * custom values are imported correctly * standard (fast, slow, medium) values are changed to match values in the MSO Reviewed-on: https://gerrit.libreoffice.org/49139 Tested-by: Jenkins Reviewed-by: Szymon Kłos (cherry picked from commit a8a3e6a7fee5ac23bc2155b9391ead9402211147) Change-Id: I004242afbbf641fe414abc8df248a2844c104502 --- include/oox/ppt/slidetransition.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx index 8986016f30aa..5a31b158334b 100644 --- a/include/oox/ppt/slidetransition.hxx +++ b/include/oox/ppt/slidetransition.hxx @@ -43,7 +43,10 @@ namespace oox { namespace ppt { void setSlideProperties( PropertyMap& props ); void setTransitionFilterProperties( const css::uno::Reference< css::animations::XTransitionFilter > & xFilter ); + /// Set one of standard values for slide transition duration void setOoxTransitionSpeed( sal_Int32 nToken ); + /// Set slide transition time directly + void setOoxTransitionSpeed( double fDuration ); void setMode( bool bMode ) { mbMode = bMode; } void setOoxAdvanceTime( sal_Int32 nAdvanceTime ) @@ -66,6 +69,7 @@ namespace oox { namespace ppt { ::sal_Int16 mnTransitionSubType; bool mbTransitionDirectionNormal; css::presentation::AnimationSpeed mnAnimationSpeed; + double mfTransitionDurationInSeconds; bool mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */ ::sal_Int32 mnAdvanceTime; }; -- cgit v1.2.3