strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED

Browse source 
2008/04/21 07:54:44 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED
2007/10/01 13:49:12 thb 1.8.18.1: #i79258# Merge from CWS picom
This commit is contained in:
Kurt Zenker 2008-06-24 11:06:17 +00:00
parent 41a210b157
commit ab92ebbdb0
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
slideshow/source/engine/activities/discreteactivitybase.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: discreteactivitybase.cxx,v $
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* 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 <discreteactivitybase.hxx>
@ -49,10 +50,10 @@ namespace slideshow
mnSimpleDuration( rParms.mnMinDuration ),
mnCurrPerformCalls( 0 )
{
ENSURE_AND_THROW( mpWakeupEvent,
ENSURE_OR_THROW( mpWakeupEvent,
"DiscreteActivityBase::DiscreteActivityBase(): Invalid wakeup event" );
ENSURE_AND_THROW( !maDiscreteTimes.empty(),
ENSURE_OR_THROW( !maDiscreteTimes.empty(),
"DiscreteActivityBase::DiscreteActivityBase(): time vector is empty, why do you create me?" );
#ifdef DBG_UTIL
@ -66,11 +67,11 @@ namespace slideshow
maDiscreteTimes[i-1] < 0.0 ||
maDiscreteTimes[i-1] > 1.0 )
{
ENSURE_AND_THROW( false, "DiscreteActivityBase::DiscreteActivityBase(): time values not within [0,1] range!" );
ENSURE_OR_THROW( false, "DiscreteActivityBase::DiscreteActivityBase(): time values not within [0,1] range!" );
}
if( maDiscreteTimes[i-1] > maDiscreteTimes[i] )
ENSURE_AND_THROW( false, "DiscreteActivityBase::DiscreteActivityBase(): time vector is not sorted in ascending order!" );
ENSURE_OR_THROW( false, "DiscreteActivityBase::DiscreteActivityBase(): time vector is not sorted in ascending order!" );
}
// TODO(E2): check this also in production code?