diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:13:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:13:11 +0000 |
| commit | 2b9e7db7c50218986afb03281380d14e02eadb71 (patch) | |
| tree | b7a8cac1d42f3989741dbf767585ec0f04e2cfb8 /slideshow | |
| parent | 1a5f60c08cf5048408de43bbf48c83ae5c876315 (diff) | |
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
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slide/slideanimations.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 04203900e819..28d2aadb6fb5 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -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" ); } |