diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | 17d0f112effa923bc6bfeb799a775b9050941573 (patch) | |
| tree | 6ff5dcb5d1338c41641b3deb5f0ae2886d579a92 /slideshow/source/engine/eventqueue.cxx | |
| parent | 81835b80ab54e2e0b41c48286f9f021f3f4237b2 (diff) | |
| parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'slideshow/source/engine/eventqueue.cxx')
| -rw-r--r-- | slideshow/source/engine/eventqueue.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 3b5cd31f1307..f7af3156ff0b 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -109,7 +109,7 @@ namespace slideshow rEvent.get(), rEvent->getActivationTime(0.0)); #endif - ENSURE_OR_RETURN( rEvent, + ENSURE_OR_RETURN_FALSE( rEvent, "EventQueue::addEvent: event ptr NULL" ); // prepare entry @@ -138,7 +138,7 @@ namespace slideshow rEvent->getActivationTime(0.0)); #endif - ENSURE_OR_RETURN( rEvent.get() != NULL, + ENSURE_OR_RETURN_FALSE( rEvent.get() != NULL, "EventQueue::addEvent: event ptr NULL" ); maNextEvents.push_back( EventEntry( rEvent, rEvent->getActivationTime( @@ -158,7 +158,7 @@ namespace slideshow rpEvent->getActivationTime(0.0)); #endif - ENSURE_OR_RETURN( + ENSURE_OR_RETURN_FALSE( rpEvent.get() != NULL, "EventQueue::addEvent: event ptr NULL"); |