diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:13:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:13:46 +0000 |
| commit | d3b17bdb71bd1a01768a646bda06f080535c3a47 (patch) | |
| tree | 7031c3c2c62ac359641c92ccba6db6c83922ca8e /slideshow | |
| parent | bae896db0269eee0a198535e66dcfc52f87cb63d (diff) | |
INTEGRATION: CWS canvas05 (1.6.46); FILE MERGED
2008/04/21 07:53:53 thb 1.6.46.2: RESYNC: (1.6-1.7); FILE MERGED
2007/10/01 13:49:14 thb 1.6.46.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/transitions/clippingfunctor.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx index 4163382680b1..90d24c424d5d 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.cxx +++ b/slideshow/source/engine/transitions/clippingfunctor.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: clippingfunctor.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * 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 "clippingfunctor.hxx" #include "transitiontools.hxx" @@ -51,7 +52,7 @@ namespace slideshow mbScaleIsotrophically( rTransitionInfo.mbScaleIsotrophically ), mbFlip(false) { - ENSURE_AND_THROW( rPolygon, + ENSURE_OR_THROW( rPolygon, "ClippingFunctor::ClippingFunctor(): Invalid parametric polygon" ); // maBackgroundRect serves as the minuent when @@ -104,7 +105,7 @@ namespace slideshow switch( rTransitionInfo.meReverseMethod ) { default: - ENSURE_AND_THROW( + ENSURE_OR_THROW( false, "TransitionFactory::TransitionFactory(): Unexpected reverse method" ); break; |