diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-26 16:47:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-27 11:30:15 +0200 |
| commit | f8ae36322d524d1aa755af144852701c25ebe7a2 (patch) | |
| tree | e8a48796bcede860b769bda344f43e95ef80889c | |
| parent | 298abfd91b19d89ce9af1610ea497dfe4d536fca (diff) | |
readonly mnFadeColor in SlideTransition
since
commit c714b43b0137ad253f51e1c65417c9874b8509e5
Date: Mon Jul 20 13:12:31 2015 +0200
loplugin:unusedmethods oox
Change-Id: Ibece5543b2012bd5a18d82058faa8554ed155777
Reviewed-on: https://gerrit.libreoffice.org/42835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/oox/ppt/slidetransition.hxx | 1 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx index e11298a0a04e..8986016f30aa 100644 --- a/include/oox/ppt/slidetransition.hxx +++ b/include/oox/ppt/slidetransition.hxx @@ -66,7 +66,6 @@ namespace oox { namespace ppt { ::sal_Int16 mnTransitionSubType; bool mbTransitionDirectionNormal; css::presentation::AnimationSpeed mnAnimationSpeed; - ::sal_Int32 mnFadeColor; bool mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */ ::sal_Int32 mnAdvanceTime; }; diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index a0ac34848d79..f739c63cb7af 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -45,7 +45,6 @@ namespace oox { namespace ppt { , mnTransitionSubType( 0 ) , mbTransitionDirectionNormal( true ) , mnAnimationSpeed( AnimationSpeed_FAST ) - , mnFadeColor( 0 ) , mbMode( true ) , mnAdvanceTime( -1 ) { @@ -57,7 +56,6 @@ namespace oox { namespace ppt { , mnTransitionSubType( 0 ) , mbTransitionDirectionNormal( true ) , mnAnimationSpeed( AnimationSpeed_FAST ) - , mnFadeColor( 0 ) , mbMode( true ) , mnAdvanceTime( -1 ) { @@ -78,11 +76,11 @@ namespace oox { namespace ppt { aProps.setProperty( PROP_TransitionSubtype, mnTransitionSubType); aProps.setProperty( PROP_TransitionDirection, mbTransitionDirectionNormal); aProps.setProperty( PROP_Speed, mnAnimationSpeed); - aProps.setProperty( PROP_TransitionFadeColor, mnFadeColor); - if( mnAdvanceTime != -1 ) { - aProps.setProperty( PROP_Duration, mnAdvanceTime/1000); - aProps.setProperty( PROP_Change, static_cast<sal_Int32>(1)); - } + aProps.setProperty( PROP_TransitionFadeColor, sal_Int32(0)); + if( mnAdvanceTime != -1 ) { + aProps.setProperty( PROP_Duration, mnAdvanceTime/1000); + aProps.setProperty( PROP_Change, static_cast<sal_Int32>(1)); + } } catch( Exception& ) { @@ -98,7 +96,7 @@ namespace oox { namespace ppt { xFilter->setTransition( mnTransitionType ); xFilter->setSubtype( mnTransitionSubType ); xFilter->setDirection( mbTransitionDirectionNormal ); - xFilter->setFadeColor( mnFadeColor ); + xFilter->setFadeColor( 0 ); xFilter->setMode( mbMode ); } catch( Exception& ) |