diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:05:53 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:05:53 +0000 |
| commit | 09e020063255373384620821a979b3ccfe9517b6 (patch) | |
| tree | 8a5e21724d7f06dd4751cfa6b3d950333a9593b7 /slideshow/source/engine/activities/activitybase.cxx | |
| parent | b5806b939960a5fd56c14ea0cb27cfda0edf30c2 (diff) | |
INTEGRATION: CWS canvas05 (1.10.18); FILE MERGED
2008/04/21 07:54:50 thb 1.10.18.2: RESYNC: (1.10-1.11); FILE MERGED
2007/10/01 13:49:12 thb 1.10.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow/source/engine/activities/activitybase.cxx')
| -rw-r--r-- | slideshow/source/engine/activities/activitybase.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index b2abcee9544f..b1454bfbe392 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: activitybase.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ // must be first #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> @@ -106,9 +107,9 @@ namespace slideshow void ActivityBase::setTargets( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { - ENSURE_AND_THROW( rShape, + ENSURE_OR_THROW( rShape, "ActivityBase::setTargets(): Invalid shape" ); - ENSURE_AND_THROW( rAttrLayer, + ENSURE_OR_THROW( rAttrLayer, "ActivityBase::setTargets(): Invalid attribute layer" ); mpShape = rShape; |