diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:06:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:06:45 +0000 |
| commit | 4a56d1f550fa39706989f9fa07fc08ca990de27f (patch) | |
| tree | 2ed0af817aa1494a7b47f390f20c2e4d8f3b9111 /slideshow | |
| parent | 62cbfc153adcbb7297c06643f97c4f917eb8a3d6 (diff) | |
INTEGRATION: CWS canvas05 (1.14.18); FILE MERGED
2008/04/21 07:54:38 thb 1.14.18.2: RESYNC: (1.14-1.15); FILE MERGED
2007/10/01 13:49:12 thb 1.14.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationbasenode.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 5d2da236deb9..bc95d636aed5 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: animationbasenode.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -121,12 +121,12 @@ AnimationBaseNode::AnimationBaseNode( presentation::ParagraphTarget aTarget; if( !(mxAnimateNode->getTarget() >>= aTarget) ) - ENSURE_AND_THROW( + ENSURE_OR_THROW( false, "could not extract any target information" ); xShape = aTarget.Shape; - ENSURE_AND_THROW( xShape.is(), "invalid shape in ParagraphTarget" ); + ENSURE_OR_THROW( xShape.is(), "invalid shape in ParagraphTarget" ); mpShape = lookupAttributableShape( getContext().mpSubsettableShapeManager, xShape ); @@ -249,7 +249,7 @@ void AnimationBaseNode::activate_st() // create new attribute layer maAttributeLayerHolder.createAttributeLayer( getShape() ); - ENSURE_AND_THROW( maAttributeLayerHolder.get(), + ENSURE_OR_THROW( maAttributeLayerHolder.get(), "Could not generate shape attribute layer" ); // TODO(Q2): This affects the way mpActivity |