diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:52:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:52:18 +0000 |
| commit | 4c14da0453576c31e4c4c73d16000fa9fa05ef51 (patch) | |
| tree | 2370cbb149fddab5d89f6d0cf9d221f08d5c6850 | |
| parent | b1675c906465dcf03db90cc500986a21483ff4ee (diff) | |
INTEGRATION: CWS sj31 (1.16.46); FILE MERGED
2005/11/25 09:36:55 cl 1.16.46.1: #i58102# skip effecs without valid effect sequence and assert. just to be safe
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1fc9d517b8b5..711781448456 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -4,9 +4,9 @@ * * $RCSfile: CustomAnimationPane.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2005-11-17 16:11:25 $ + * last change: $Author: rt $ $Date: 2005-12-14 15:52:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1338,6 +1338,10 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper { CustomAnimationEffectPtr pEffect = (*aIter++); + DBG_ASSERT( pEffect->getEffectSequence(), "sd::CustomAnimationPane::changeSelection(), dead effect in selection!" ); + if( !pEffect->getEffectSequence() ) + continue; + double fDuration; // we might need this for iterate-interval if( pResultSet->getPropertyState( nHandleDuration ) == STLPropertyState_DIRECT ) { |