diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:58:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:58:16 +0000 |
| commit | df513b77fc2f891449a0a5ae30b4188af06c350a (patch) | |
| tree | 145747b1184da4b574267ff8d232e62b02f4d065 /slideshow | |
| parent | 15f5b6a3024f363ca7ed5926012296d7bea520d7 (diff) | |
INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED
2006/04/12 20:40:09 thb 1.3.18.2: #i37778# Replaced all shared_ptr.get() != NULL places with the more elegant automatic-conversion-to-bool version (at least where the compiler tolerated that)
2006/03/24 18:23:34 thb 1.3.18.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/inc/interruptabledelayevent.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index c589a1de74dc..ce527ee276ed 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -4,9 +4,9 @@ * * $RCSfile: interruptabledelayevent.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 21:13:46 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:58:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,7 +38,7 @@ #include <delayevent.hxx> -namespace presentation +namespace slideshow { namespace internal { @@ -61,8 +61,7 @@ namespace presentation virtual bool fire() { - if( mpEvent.get() != NULL && - isCharged() ) + if( mpEvent && isCharged() ) { // pass on directly - we're supposed to be called // from EventQueue here, anyway - and if not, @@ -78,7 +77,7 @@ namespace presentation // pass on to wrappee - this ensures that we return // false on isCharged(), even if the other event has // been fired outside our own fire() method - return mpEvent.get() == NULL ? false : mpEvent->isCharged(); + return !mpEvent ? false : mpEvent->isCharged(); } virtual double getActivationTime( double nCurrentTime ) const |