diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:41 +0000 |
| commit | 7012d06de0a47d6621ae0d366eb00bf8b052e46e (patch) | |
| tree | 618168c9410be370331dc4dcda57cd3de8b9ed14 /slideshow | |
| parent | 830b1775171a2ae6bc000d392f88c390e66b7279 (diff) | |
INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED
2008/04/21 07:54:32 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED
2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/generateevent.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index 5072aaf69c9b..0983019dafef 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: generateevent.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * 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 <com/sun/star/drawing/XShape.hpp> @@ -76,7 +77,7 @@ EventSharedPtr generateEvent( OSL_ENSURE( false, "MEDIA timing not yet implemented!" ); break; default: - ENSURE_AND_THROW( false, "unexpected case!" ); + ENSURE_OR_THROW( false, "unexpected case!" ); } } else if (rEventDescription >>= aEvent) { @@ -97,7 +98,7 @@ EventSharedPtr generateEvent( switch (aEvent.Trigger) { default: - ENSURE_AND_THROW( false, "unexpected event trigger!" ); + ENSURE_OR_THROW( false, "unexpected event trigger!" ); case animations::EventTrigger::NONE: // no event at all break; |