diff options
| author | Marco Cecchetti <mrcekets@gmail.com> | 2012-06-26 22:08:02 +0200 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2012-06-28 12:28:07 +0200 |
| commit | ed92cdd7f131bc37957d91d9ff171a2c5c2716c7 (patch) | |
| tree | 9409e33715743028fadad5999e03ad95fe7adb20 | |
| parent | 5525b212faadc83df458b0911d416a734357ea30 (diff) | |
Bug fix: now skip effect work correctly with repeated animations
| -rw-r--r-- | slideshow/source/engine/animationnodes/basecontainernode.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 6dab08e5fe1e..e2a3a6632559 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -85,6 +85,7 @@ bool BaseContainerNode::init_children() void BaseContainerNode::deactivate_st( NodeState eDestState ) { + mnLeftIterations = 0; // in order to make skip effect work correctly if (eDestState == FROZEN) { // deactivate all children that are not FROZEN or ENDED: forEachChildNode( boost::mem_fn(&AnimationNode::deactivate), @@ -178,7 +179,7 @@ bool BaseContainerNode::notifyDeactivatedChild( bool BaseContainerNode::repeat() { - deactivate_st( ENDED ); + forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED ); sal_Bool bState = init_children(); if( bState ) activate_st(); |