diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:09:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:09:23 +0000 |
| commit | c912d5575b74583c509937955d25c83e29fe8cc6 (patch) | |
| tree | 49eac2452d9bdf6cd831ecaa78369dbf65081130 /slideshow | |
| parent | 056910b69ea63214800f0e7b648c6c246166fe04 (diff) | |
INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED
2008/04/21 07:54:08 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED
2007/10/01 13:49:12 thb 1.8.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/setactivity.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx index dfddbc7e6cfa..27f8e856da05 100644 --- a/slideshow/source/engine/animationnodes/setactivity.hxx +++ b/slideshow/source/engine/animationnodes/setactivity.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: setactivity.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ // must be first #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include "animationactivity.hxx" @@ -69,7 +70,7 @@ public: maToValue( rToValue ), mbIsActive(true) { - ENSURE_AND_THROW( mpAnimation, "Invalid animation" ); + ENSURE_OR_THROW( mpAnimation, "Invalid animation" ); } virtual void dispose() @@ -125,8 +126,8 @@ public: virtual void setTargets( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { - ENSURE_AND_THROW( rShape, "Invalid shape" ); - ENSURE_AND_THROW( rAttrLayer, "Invalid attribute layer" ); + ENSURE_OR_THROW( rShape, "Invalid shape" ); + ENSURE_OR_THROW( rAttrLayer, "Invalid attribute layer" ); mpShape = rShape; mpAttributeLayer = rAttrLayer; |