diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:07:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:07:40 +0000 |
| commit | 21ffcfa95758a8b366b334837bcebf0266617f4e (patch) | |
| tree | 8994b144cc541c62446c964db7be13b26d4c6dea /slideshow | |
| parent | 0d10b0662a4f40293cd98d5fe9eb07a4fe0a455a (diff) | |
INTEGRATION: CWS canvas05 (1.9.18); FILE MERGED
2008/04/21 07:54:02 thb 1.9.18.2: RESYNC: (1.9-1.10); FILE MERGED
2007/10/01 13:49:12 thb 1.9.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationsetnode.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index ecc96a81e386..f7669b7214d3 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: animationsetnode.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -76,7 +76,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const if (! isIndefiniteTiming( xAnimateNode->getDuration() )) { boost::shared_ptr<AnimationSetNode> const pSelf( boost::dynamic_pointer_cast<AnimationSetNode>(getSelf()) ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( pSelf, "cannot cast getSelf() to my type!" ); aParms.mpEndEvent = makeEvent( boost::bind( &AnimationSetNode::implScheduleDeactivationEvent, @@ -86,7 +86,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const switch (AnimationFactory::classifyAttributeName( attrName )) { default: case AnimationFactory::CLASS_UNKNOWN_PROPERTY: - ENSURE_AND_THROW( + ENSURE_OR_THROW( false, "AnimationSetNode::createSetActivity(): " "Unexpected attribute class" ); break; @@ -95,7 +95,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { NumberAnimation::ValueType aValue; - ENSURE_AND_THROW( + ENSURE_OR_THROW( extractValue( aValue, xAnimateNode->getTo(), pShape, @@ -118,7 +118,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { EnumAnimation::ValueType aValue; - ENSURE_AND_THROW( + ENSURE_OR_THROW( extractValue( aValue, xAnimateNode->getTo(), pShape, @@ -141,7 +141,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { ColorAnimation::ValueType aValue; - ENSURE_AND_THROW( + ENSURE_OR_THROW( extractValue( aValue, xAnimateNode->getTo(), pShape, @@ -164,7 +164,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { StringAnimation::ValueType aValue; - ENSURE_AND_THROW( + ENSURE_OR_THROW( extractValue( aValue, xAnimateNode->getTo(), pShape, @@ -187,7 +187,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { BoolAnimation::ValueType aValue; - ENSURE_AND_THROW( + ENSURE_OR_THROW( extractValue( aValue, xAnimateNode->getTo(), pShape, |