[Libreoffice-commits] core.git: sd/source

[Mark Hung]

 sd/source/ui/animations/CustomAnimationPane.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 7414e07f52af87094240f5c3d9a0eb764e8642f5
Author: Mark Hung <marklh9 at gmail.com>
Date:   Thu Jun 21 22:27:11 2018 +0800

    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 at gmail.com>

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();