INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:02 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
This commit is contained in:
parent
1a5f60c08c
commit
2b9e7db7c5
1 changed files with 4 additions and 2 deletions
|
@ -7,7 +7,7 @@
|
|||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: slideanimations.cxx,v $
|
||||
* $Revision: 1.3 $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
|
@ -33,6 +33,8 @@
|
|||
|
||||
// must be first
|
||||
#include <canvas/debug.hxx>
|
||||
#include <tools/diagnose_ex.h>
|
||||
#include <tools/diagnose_ex.h>
|
||||
|
||||
#include <comphelper/anytostring.hxx>
|
||||
#include <cppuhelper/exc_hlp.hxx>
|
||||
|
@ -52,7 +54,7 @@ namespace slideshow
|
|||
maSlideSize( rSlideSize ),
|
||||
mpRootNode()
|
||||
{
|
||||
ENSURE_AND_THROW( maContext.mpSubsettableShapeManager,
|
||||
ENSURE_OR_THROW( maContext.mpSubsettableShapeManager,
|
||||
"SlideAnimations::SlideAnimations(): Invalid SlideShowContext" );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue