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
This commit is contained in:
Kurt Zenker 2008-06-24 11:13:46 +00:00
parent bae896db02
commit d3b17bdb71

View file

@ -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;