[Libreoffice-commits] .: 2 commits - libcmis/makefile.mk sd/source

[Caolán McNamara]

 libcmis/makefile.mk                      |    6 ++++++
 sd/source/core/CustomAnimationEffect.cxx |    5 +++++
 2 files changed, 11 insertions(+)

New commits:
commit 63f00d37a20169743d9709977b382c379560ef9e
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

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() );
 
commit 428056b9685f34bba6b4181c6a15d20931b273b7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 4 09:19:37 2012 +0100

    add depend on makefile.mk
    
    Change-Id: If065fe11b708d8c7135b5740169cc2ce17581000

diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index b5ffd5d..a65123b 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -68,3 +68,9 @@ BUILD_DIR=src$/libcmis
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
+# Since you never know what will be in a patch (for example, it may already
+# patch at configure level) or in the case of a binary patch, we remove the
+# entire package directory if a patch is newer.
+# Changes in this makefile could also make a complete build necessary if
+# configure is affected.
+$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk