diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:09:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:09:41 +0000 |
| commit | 6237733fa1562ac24a2324d80be61f3ede169483 (patch) | |
| tree | 2e05052fd05a4fab4ee2c58edb0a9025044bfd69 /slideshow | |
| parent | c912d5575b74583c509937955d25c83e29fe8cc6 (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:35 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED
2008/04/07 14:42:08 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/drawinglayeranimation.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index cced57583c9c..c009de62902f 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawinglayeranimation.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * 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/elapsedtime.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -702,7 +703,7 @@ bool ActivityImpl::perform() if( !isActive() ) return false; - ENSURE_AND_RETURN( + ENSURE_OR_RETURN( mpDrawShape, "ActivityImpl::perform(): still active, but NULL draw shape" ); @@ -796,7 +797,7 @@ ActivityImpl::ActivityImpl( mpDrawShape->setVisibility(false); basegfx::B2DRectangle aScrollRect, aPaintRect; - ENSURE_AND_THROW( getRectanglesFromScrollMtf( aScrollRect, + ENSURE_OR_THROW( getRectanglesFromScrollMtf( aScrollRect, aPaintRect, mpMetaFile ), "ActivityImpl::ActivityImpl(): Could not extract " |