diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:02:19 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:02:19 +0000 |
| commit | ccb9b54c956b688cdaff663b772090c7ca8b08de (patch) | |
| tree | fbb6489ca4373785e98200c1c5b68f5d66a3fc56 /slideshow/source/engine/eventqueue.cxx | |
| parent | INTEGRATION: CWS canvas05 (1.13.18); FILE MERGED (diff) | |
| download | core-ccb9b54c956b688cdaff663b772090c7ca8b08de.tar.gz core-ccb9b54c956b688cdaff663b772090c7ca8b08de.zip | |
INTEGRATION: CWS canvas05 (1.13.18); FILE MERGED
2008/04/21 07:53:01 thb 1.13.18.2: RESYNC: (1.13-1.14); FILE MERGED
2007/10/01 13:49:11 thb 1.13.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow/source/engine/eventqueue.cxx')
| -rw-r--r-- | slideshow/source/engine/eventqueue.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index cc8a66108cd7..9d7b7ed65eb1 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: eventqueue.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * 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 <comphelper/anytostring.hxx> @@ -102,7 +103,7 @@ namespace slideshow { ::osl::MutexGuard aGuard( maMutex ); - ENSURE_AND_RETURN( rEvent, + ENSURE_OR_RETURN( rEvent, "EventQueue::addEvent: event ptr NULL" ); // prepare entry @@ -123,7 +124,7 @@ namespace slideshow { ::osl::MutexGuard aGuard( maMutex ); - ENSURE_AND_RETURN( rEvent.get() != NULL, + ENSURE_OR_RETURN( rEvent.get() != NULL, "EventQueue::addEvent: event ptr NULL" ); maNextEvents.push_back( EventEntry( rEvent, rEvent->getActivationTime( |