summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2018-06-21 22:27:11 +0800
committerMark Hung <marklh9@gmail.com>2018-06-24 03:53:02 +0200
commit7414e07f52af87094240f5c3d9a0eb764e8642f5 (patch)
treeaf3e2777e07453e0c48d23de83c830e93d1ce4db
parent2862e598d87214aefd8a12d7d083c3fc8da11b57 (diff)
tdf#33022 Dispose the deprecated motion path.
Change-Id: I8b31b0feedd84893327b2a4acc436d46c2306450 Reviewed-on: https://gerrit.libreoffice.org/56240 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 43f2c119019b..44987fcaa791 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2172,6 +2172,16 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
{
CustomAnimationEffectPtr pEffect = (*aIter++);
+ // Dispose the deprecated motion path tag. It will be rebuilt later.
+ if (pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH)
+ {
+ for (auto const& xTag: maMotionPathTags)
+ {
+ if(xTag->getEffect() == pEffect && !xTag->isDisposed())
+ xTag->Dispose();
+ }
+ }
+
EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence();
if( !pEffectSequence )
pEffectSequence = mpMainSequence.get();