diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:11:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:11:21 +0000 |
| commit | e4fbbf410e18d41b51b9322eb322bff0cc7ca6ab (patch) | |
| tree | af94b0fc798496a59013d603a1b3cb60d3befc6c /slideshow | |
| parent | fce7fc1fa7661323fb8cba5109bc5f222f69d6cf (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:22 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED
2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/intrinsicanimationactivity.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index f48c3dbfa817..6c9ee308f379 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: intrinsicanimationactivity.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ #include "precompiled_slideshow.hxx" #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include "drawshapesubsetting.hxx" @@ -145,13 +146,13 @@ namespace slideshow mnLoopCount(0), mbIsActive(false) { - ENSURE_AND_THROW( rContext.mpSubsettableShapeManager, + ENSURE_OR_THROW( rContext.mpSubsettableShapeManager, "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Invalid shape manager" ); - ENSURE_AND_THROW( rDrawShape, + ENSURE_OR_THROW( rDrawShape, "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Invalid draw shape" ); - ENSURE_AND_THROW( rWakeupEvent, + ENSURE_OR_THROW( rWakeupEvent, "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Invalid wakeup event" ); - ENSURE_AND_THROW( !rTimeouts.empty(), + ENSURE_OR_THROW( !rTimeouts.empty(), "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Empty timeout vector" ); maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( |