diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:14:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:14:33 +0000 |
| commit | ff0a0fb6a46beefae1aa571b9af1827be339c320 (patch) | |
| tree | 607d80c55e0359672942f375529eab6e7a53ffe6 /slideshow | |
| parent | 682ecc3210bd19c5f352e6076374e69d98b31b35 (diff) | |
INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED
2008/04/21 07:53:56 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED
2007/10/01 13:49:14 thb 1.8.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/transitions/slidechangebase.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 500165b18b19..c8b5cc4a4970 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: slidechangebase.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * 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/canvastools.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -70,7 +71,7 @@ SlideChangeBase::SlideChangeBase( boost::optional<SlideSharedPtr> const & leavin mbFinished(false), mbPrefetched(false) { - ENSURE_AND_THROW( + ENSURE_OR_THROW( pEnteringSlide, "SlideChangeBase::SlideChangeBase(): Invalid entering slide!" ); } @@ -120,14 +121,14 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& pCanvas, slideSizePixel ) ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( pBitmap, "SlideChangeBase::createBitmap(): Cannot create page bitmap" ); cppcanvas::BitmapCanvasSharedPtr pBitmapCanvas( pBitmap->getBitmapCanvas() ); - ENSURE_AND_THROW( pBitmapCanvas, + ENSURE_OR_THROW( pBitmapCanvas, "SlideChangeBase::createBitmap(): " "Cannot create page bitmap canvas" ); |