diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:10:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:10:46 +0000 |
| commit | 651402cce056647bcde3c54c7931fb16000ff912 (patch) | |
| tree | dd29fab94a84a5b685dbc69ec2005e78cd9e0a05 /slideshow | |
| parent | cacbe1d7f69176e5520f456dd8efc9fac95efa92 (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:18 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/externalshapebase.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 2a196e82c8d5..7c7925d3396e 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: externalshapebase.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * 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 <comphelper/anytostring.hxx> @@ -107,7 +108,7 @@ namespace slideshow mnPriority( nPrio ), // TODO(F1): When ZOrder someday becomes usable: make this ( getAPIShapePrio( xShape ) ), maBounds( getAPIShapeBounds( xShape ) ) { - ENSURE_AND_THROW( mxShape.is(), "ExternalShapeBase::ExternalShapeBase(): Invalid XShape" ); + ENSURE_OR_THROW( mxShape.is(), "ExternalShapeBase::ExternalShapeBase(): Invalid XShape" ); mpShapeManager->addIntrinsicAnimationHandler( mpListener ); mrEventMultiplexer.addViewHandler( mpListener ); |