diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:11:37 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:11:37 +0000 |
| commit | 54a90b5059d76254124f964c09e51122d7f7fd4e (patch) | |
| tree | 95075854f7eebec5494ac657f88814fe3ae3d557 /slideshow | |
| parent | e4fbbf410e18d41b51b9322eb322bff0cc7ca6ab (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:09 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/viewappletshape.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 3c614de7d4c0..0889fd7654ed 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewappletshape.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ // must be first #include <canvas/verbosetrace.hxx> +#include <tools/diagnose_ex.h> #include <canvas/debug.hxx> #include <comphelper/anytostring.hxx> @@ -83,10 +84,10 @@ namespace slideshow mxFrame(), mxComponentContext( rxContext ) { - ENSURE_AND_THROW( rxShape.is(), "ViewAppletShape::ViewAppletShape(): Invalid Shape" ); - ENSURE_AND_THROW( mpViewLayer, "ViewAppletShape::ViewAppletShape(): Invalid View" ); - ENSURE_AND_THROW( mpViewLayer->getCanvas(), "ViewAppletShape::ViewAppletShape(): Invalid ViewLayer canvas" ); - ENSURE_AND_THROW( mxComponentContext.is(), "ViewAppletShape::ViewAppletShape(): Invalid component context" ); + ENSURE_OR_THROW( rxShape.is(), "ViewAppletShape::ViewAppletShape(): Invalid Shape" ); + ENSURE_OR_THROW( mpViewLayer, "ViewAppletShape::ViewAppletShape(): Invalid View" ); + ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewAppletShape::ViewAppletShape(): Invalid ViewLayer canvas" ); + ENSURE_OR_THROW( mxComponentContext.is(), "ViewAppletShape::ViewAppletShape(): Invalid component context" ); uno::Reference<lang::XMultiComponentFactory> xFactory( mxComponentContext->getServiceManager(), @@ -140,7 +141,7 @@ namespace slideshow bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds ) { - ENSURE_AND_RETURN( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(), + ENSURE_OR_RETURN( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(), "ViewAppletShape::startApplet(): Invalid or disposed view" ); try { |