diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:14:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:14:57 +0000 |
| commit | 3dad864d214d20014d90b4f302a6cd048f5bbc7f (patch) | |
| tree | c5024882b2f82a1144d9ab3b512964d03caf8b17 /slideshow/source | |
| parent | 57b78f9b3819506bf5e07fb32685cbdde29f27d9 (diff) | |
INTEGRATION: CWS canvas05 (1.14.16); FILE MERGED
2008/04/21 07:53:50 thb 1.14.16.4: RESYNC: (1.15-1.16); FILE MERGED
2008/01/22 14:01:19 thb 1.14.16.3: #i10000# Post-resync build breaker
2008/01/22 00:53:47 thb 1.14.16.2: RESYNC: (1.14-1.15); FILE MERGED
2007/10/01 13:49:14 thb 1.14.16.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index c3e0c36d6..b82025abf 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: slidetransitionfactory.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * 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 <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tools/canvastools.hxx> @@ -147,8 +148,8 @@ public: getEnteringBitmap(ViewEntry(*aCurrView))->getXBitmap(), basegfx::unotools::point2DFromB2DPoint(aOffsetPixel) ) ); - ENSURE_AND_THROW(maTransitions.back().is(), - "Failed to create plugin transition"); + ENSURE_OR_THROW(maTransitions.back().is(), + "Failed to create plugin transition"); ++aCurrView; } } @@ -288,7 +289,7 @@ void FadingSlideChange::performIn( const ::cppcanvas::CanvasSharedPtr& /*rDestinationCanvas*/, double t ) { - ENSURE_AND_THROW( + ENSURE_OR_THROW( rSprite, "FadingSlideChange::performIn(): Invalid sprite" ); @@ -306,10 +307,10 @@ void FadingSlideChange::performOut( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ) { - ENSURE_AND_THROW( + ENSURE_OR_THROW( rSprite, "FadingSlideChange::performOut(): Invalid sprite" ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( rDestinationCanvas, "FadingSlideChange::performOut(): Invalid dest canvas" ); @@ -410,10 +411,10 @@ void MovingSlideChange::performIn( { // intro sprite moves: - ENSURE_AND_THROW( + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performIn(): Invalid sprite" ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performIn(): Invalid dest canvas" ); @@ -448,10 +449,10 @@ void MovingSlideChange::performOut( { // outro sprite moves: - ENSURE_AND_THROW( + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performOut(): Invalid sprite" ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performOut(): Invalid dest canvas" ); @@ -727,7 +728,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( return NumberAnimationSharedPtr(); } - ENSURE_AND_THROW( + ENSURE_OR_THROW( pEnteringSlide, "TransitionFactory::createSlideTransition(): Invalid entering slide" ); @@ -804,12 +805,12 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createSlideTransition(): " "Got invalid random transition info" ); - ENSURE_AND_THROW( + ENSURE_OR_THROW( pRandomTransitionInfo->mnTransitionType != animations::TransitionType::RANDOM, "TransitionFactory::createSlideTransition(): " @@ -885,7 +886,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( break; default: - ENSURE_AND_THROW( false, + ENSURE_OR_THROW( false, "SlideTransitionFactory::createSlideTransition(): Unknown FADE subtype" ); } |