summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsAnimator.cxx')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx17
1 files changed, 7 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 5ead8fad8ee1..3b0b183801f6 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -84,9 +84,8 @@ void Animator::Dispose()
mbIsDisposed = true;
AnimationList aCopy (maAnimations);
- AnimationList::const_iterator iAnimation;
- for (iAnimation=aCopy.begin(); iAnimation!=aCopy.end(); ++iAnimation)
- (*iAnimation)->Expire();
+ for (const auto& rxAnimation : aCopy)
+ rxAnimation->Expire();
maIdle.Stop();
if (mpDrawLock)
@@ -171,10 +170,9 @@ bool Animator::ProcessAnimations (const double nTime)
return bExpired;
AnimationList aCopy (maAnimations);
- AnimationList::const_iterator iAnimation;
- for (iAnimation=aCopy.begin(); iAnimation!=aCopy.end(); ++iAnimation)
+ for (const auto& rxAnimation : aCopy)
{
- bExpired |= (*iAnimation)->Run(nTime);
+ bExpired |= rxAnimation->Run(nTime);
}
return bExpired;
@@ -188,11 +186,10 @@ void Animator::CleanUpAnimationList()
AnimationList aActiveAnimations;
- AnimationList::const_iterator iAnimation;
- for (iAnimation=maAnimations.begin(); iAnimation!=maAnimations.end(); ++iAnimation)
+ for (const auto& rxAnimation : maAnimations)
{
- if ( ! (*iAnimation)->IsExpired())
- aActiveAnimations.push_back(*iAnimation);
+ if ( ! rxAnimation->IsExpired())
+ aActiveAnimations.push_back(rxAnimation);
}
maAnimations.swap(aActiveAnimations);