diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:13 +0000 |
| commit | fdf086a1c2422d135bc8b037e5311d8af656355a (patch) | |
| tree | e0d7d40b5005c4b586277185bf582c6c5f08ba3f /slideshow | |
| parent | f8f76a33c285d2c5b43db2f78eb22de8da844787 (diff) | |
INTEGRATION: CWS canvas05 (1.11.18); FILE MERGED
2008/04/21 07:54:26 thb 1.11.18.2: RESYNC: (1.11-1.12); FILE MERGED
2007/10/01 13:49:12 thb 1.11.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basenode.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index ed19eb6c1b19..9f74a75fd571 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: basenode.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -342,7 +342,7 @@ BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, mpCurrentEvent(), mbIsMainSequenceRootNode( isMainSequenceRootNode_( xNode ) ) { - ENSURE_AND_THROW( mxAnimationNode.is(), + ENSURE_OR_THROW( mxAnimationNode.is(), "BaseNode::BaseNode(): Invalid XAnimationNode" ); // setup state transition table @@ -667,7 +667,7 @@ bool BaseNode::registerDeactivatingListener( if (! checkValidNode()) return false; - ENSURE_AND_RETURN( + ENSURE_OR_RETURN( rNotifee, "BaseNode::registerDeactivatingListener(): invalid notifee" ); maDeactivatingListeners.push_back( rNotifee ); @@ -677,9 +677,9 @@ bool BaseNode::registerDeactivatingListener( void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf ) { - ENSURE_AND_THROW( rSelf.get() == this, + ENSURE_OR_THROW( rSelf.get() == this, "BaseNode::setSelf(): got ptr to different object" ); - ENSURE_AND_THROW( !mpSelf, + ENSURE_OR_THROW( !mpSelf, "BaseNode::setSelf(): called multiple times" ); mpSelf = rSelf; |