Kaydet (Commit) aa50b3bd authored tarafından Marco Cecchetti's avatar Marco Cecchetti

Bug fix: now repeated animations and begin=’after effect ‘ works properly together.

Modified the CustomAnimationEffect class in order to take into account the repeatCount 
attribute value when computing the node effect absolute duration.
üst c1598303
...@@ -281,6 +281,10 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c ...@@ -281,6 +281,10 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c
} }
mfAbsoluteDuration = mfDuration; mfAbsoluteDuration = mfDuration;
double fRepeatCount = 1.0;
if( (mxNode->getRepeatCount()) >>= fRepeatCount )
mfAbsoluteDuration *= fRepeatCount;
checkForText(); checkForText();
} }
...@@ -755,7 +759,9 @@ void CustomAnimationEffect::setDuration( double fDuration ) ...@@ -755,7 +759,9 @@ void CustomAnimationEffect::setDuration( double fDuration )
{ {
double fScale = fDuration / mfDuration; double fScale = fDuration / mfDuration;
mfDuration = fDuration; mfDuration = fDuration;
mfAbsoluteDuration = mfDuration; double fRepeatCount = 1.0;
getRepeatCount() >>= fRepeatCount;
mfAbsoluteDuration = mfDuration * fRepeatCount;
// calculate effect duration and get target shape // calculate effect duration and get target shape
Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY ); Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY );
...@@ -954,7 +960,12 @@ sal_Int16 CustomAnimationEffect::getFill() const ...@@ -954,7 +960,12 @@ sal_Int16 CustomAnimationEffect::getFill() const
void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount ) void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount )
{ {
if( mxNode.is() ) if( mxNode.is() )
{
mxNode->setRepeatCount( rRepeatCount ); mxNode->setRepeatCount( rRepeatCount );
double fRepeatCount = 1.0;
rRepeatCount >>= fRepeatCount;
mfAbsoluteDuration = mfDuration * fRepeatCount;
}
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment