diff options
| author | Marco Cecchetti <mrcekets@gmail.com> | 2012-06-13 19:50:38 +0200 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2012-06-28 12:28:06 +0200 |
| commit | 372c47309a192e67220913309fa1ccffdff8cde1 (patch) | |
| tree | 51c00837e31e21ea5f537c4114790b60a8e0488c /slideshow/source/engine/animationnodes | |
| parent | b9cfef37900cea634dc6fb987498b840230399bd (diff) | |
Now to animations and repeated to animations are handled by the C++ presentation engine
as the SMIL spec describes.
Diffstat (limited to 'slideshow/source/engine/animationnodes')
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationbasenode.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index df1bcc5b9f83..ed6349522f22 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -33,6 +33,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> #include <com/sun/star/presentation/ParagraphTarget.hpp> +#include <com/sun/star/animations/AnimationNodeType.hpp> #include <com/sun/star/animations/Timing.hpp> #include <com/sun/star/animations/AnimationAdditiveMode.hpp> #include <com/sun/star/presentation/ShapeAnimationSubType.hpp> @@ -421,7 +422,18 @@ AnimationBaseNode::fillCommonParameters() const else aRepeats.reset( nRepeats / nDuration ); } - else { + // This is a temporary workaround: + // as the repeatCount attribute is defined on the <par> parent node + // and activities are created only for animation node leaves, that + // actual performs a shape effect, we get the repeatCount value + // from the parent node. + else if( ( getXAnimationNode()->getType() != animations::AnimationNodeType::SET ) + && (getParentNode()->getXAnimationNode()->getRepeatCount() >>= nRepeats) ) + { + aRepeats.reset( nRepeats ); + } + else + { // no double value for both values - Timing::INDEFINITE? animations::Timing eTiming; |