[Libreoffice-commits] core.git: Branch 'aoo/trunk' - animations/source

[Armin Le Grand]

 animations/source/animcore/animcore.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 55aeb4ebc2da692490c1ec5ac69941f51c01970d
Author: Armin Le Grand <alg at apache.org>
Date:   Thu Jan 30 15:46:33 2014 +0000

    i12355 in AnimationNode take invalid parent into account

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 592eb3c..dbb93aa 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2078,6 +2078,18 @@ void AnimationNode::fireChangeListener()
         }
     }
 
+    // #i123585# check mpParent, it is extracted from mxParent (see AnimationNode::setParent)
+    // and may be invalid when mxParent got deleted in the meantime
+    if(mpParent)
+    {
+        Reference< XInterface > xCheckReference(mxParent);
+
+        if(!xCheckReference.is())
+        {
+            mpParent = 0;
+        }
+    }
+
     if( mpParent )
         mpParent->fireChangeListener();
 }