From 5404f75a2fa863b97bdf8432f647053f0bff726e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 7 Nov 2018 09:26:57 +0200 Subject: loplugin:collapseif in sdext..svx Change-Id: I188d9e9b53e00acfbae3c7acd54de28f084c4b3f Reviewed-on: https://gerrit.libreoffice.org/62985 Tested-by: Jenkins Reviewed-by: Noel Grandin --- slideshow/source/engine/animationnodes/animationbasenode.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'slideshow') 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 -- cgit