diff options
| author | Katarina Behrens <bubli@bubli.org> | 2021-07-26 08:34:38 +0200 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2021-07-29 21:12:36 +0200 |
| commit | 6146b185ab2a335de39d0562a8d34e53d3e742e0 (patch) | |
| tree | 131f695d05061c36d648a25e740c805241eb86f6 | |
| parent | 5aa8ff21a01b8d5eb5acacb182fff976317f4991 (diff) | |
tdf#142817: Correctly replace animation effect that comes with a command
As effect1 with command (e.g. the one from misc/MEDIACALL category)
is created, 'mnCommand' member var is set.
But when it is replaced by command-less effect2 via
CustomAnnimationEffect::replaceNode, this var is never reset (simply
because the relevant if-else branch is never hit) so it looks as if
the command was still there. This causes UI glitch in sidebar:
setting incorrect category of the next selected effect
To fix that, we reset 'mnCommand' in ::setNode function, just as
it is done with resetting audio associated w/ the effect
Change-Id: I86016dd1acadfb31f460bde749bbe15164f1eb81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119492
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <bubli@bubli.org>
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index b28b9c512fa3..ed61bed5cb72 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -156,6 +156,7 @@ void CustomAnimationEffect::setNode( const css::uno::Reference< css::animations: { mxNode = xNode; mxAudio.clear(); + mnCommand = 0; const Sequence< NamedValue > aUserData( mxNode->getUserData() ); |