[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source

[Libreoffice Gerrit user]

 sd/source/core/CustomAnimationEffect.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit aa06651526d47d9e102fbffc6e3f17da2a7ec160
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 5 21:08:09 2012 +0100

    Related: fdo#51247 bandaid to not crash
    
    Change-Id: I1f98a6a1e5ede6fcd9a3570788969edcb251384b
    (cherry picked from commit 63f00d37a20169743d9709977b382c379560ef9e)
    Reviewed-on: https://gerrit.libreoffice.org/918
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 16756a5..2ed6115 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2819,6 +2819,11 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou
         EffectSequence aEffects( pTextGroup->maEffects );
         pTextGroup->reset();
 
+        SAL_WARN_IF(aEffects.empty(), "sd", "EffectSequenceHelper::setAnimateForm effects empty" );
+
+        if (aEffects.empty())
+            return;
+
         EffectSequence::iterator aIter( aEffects.begin() );
         const EffectSequence::iterator aEnd( aEffects.end() );