summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/animationnodes
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 09:26:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 12:39:11 +0100
commit5404f75a2fa863b97bdf8432f647053f0bff726e (patch)
tree119d2cede534f5ce1173422df99a0e532d6a7a28 /slideshow/source/engine/animationnodes
parent39efec060719bb2654ba20844ba02429371a4ffb (diff)
loplugin:collapseif in sdext..svx
Change-Id: I188d9e9b53e00acfbae3c7acd54de28f084c4b3f Reviewed-on: https://gerrit.libreoffice.org/62985 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/animationnodes')
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index f1f320feae89..1ff72c62e8a1 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -305,10 +305,8 @@ void AnimationBaseNode::activate_st()
void AnimationBaseNode::deactivate_st( NodeState eDestState )
{
- if (eDestState == FROZEN) {
- if (mpActivity)
- mpActivity->end();
- }
+ if (eDestState == FROZEN && mpActivity)
+ mpActivity->end();
if (isDependentSubsettedShape()) {
// for dependent subsets, remove subset shape