diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:12:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:12:06 +0000 |
| commit | 6b2b389f10d9b9cb96fa6ea402cd45058215de10 (patch) | |
| tree | 0afebf37d802f6f07683977f664783bd22106b04 /slideshow | |
| parent | cb40579728f017bf4f0ef5efb60478175d098260 (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:28 thb 1.2.18.4: RESYNC: (1.4-1.5); FILE MERGED
2008/04/07 14:42:05 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED
2008/01/22 00:53:42 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/viewmediashape.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index c38c624c6f5f..211b50594aa5 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewmediashape.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * 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 <math.h> @@ -89,10 +90,10 @@ namespace slideshow mxPlayerWindow(), mxComponentContext( rxContext ) { - ENSURE_AND_THROW( mxShape.is(), "ViewMediaShape::ViewMediaShape(): Invalid Shape" ); - ENSURE_AND_THROW( mpViewLayer, "ViewMediaShape::ViewMediaShape(): Invalid View" ); - ENSURE_AND_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" ); - ENSURE_AND_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" ); + ENSURE_OR_THROW( mxShape.is(), "ViewMediaShape::ViewMediaShape(): Invalid Shape" ); + ENSURE_OR_THROW( mpViewLayer, "ViewMediaShape::ViewMediaShape(): Invalid View" ); + ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" ); + ENSURE_OR_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" ); } // --------------------------------------------------------------------- @@ -250,7 +251,7 @@ namespace slideshow { if( !mxPlayer.is() && mxShape.is() ) { - ENSURE_AND_RETURN( mpViewLayer->getCanvas(), + ENSURE_OR_RETURN( mpViewLayer->getCanvas(), "ViewMediaShape::update(): Invalid layer canvas" ); uno::Reference< rendering::XCanvas > xCanvas( mpViewLayer->getCanvas()->getUNOCanvas() ); |