diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:23:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:23:54 +0000 |
| commit | cc55256fb67605c1f8d795ba04cb1116a146dc87 (patch) | |
| tree | e444e72e34c5aba08ad91950c5c8d0c847762ab7 /slideshow/source/engine/wakeupevent.cxx | |
| parent | 7c611f6d41896c5e4ac3fa5965e96debae9aad9a (diff) | |
INTEGRATION: CWS presfixes09 (1.5.18); FILE MERGED
2006/10/18 19:52:34 thb 1.5.18.3: RESYNC: (1.5-1.6); FILE MERGED
2006/04/12 20:40:05 thb 1.5.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:12 thb 1.5.18.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
Diffstat (limited to 'slideshow/source/engine/wakeupevent.cxx')
| -rw-r--r-- | slideshow/source/engine/wakeupevent.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx index 93dc758545de..2e442d5fa2d7 100644 --- a/slideshow/source/engine/wakeupevent.cxx +++ b/slideshow/source/engine/wakeupevent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wakeupevent.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:31:22 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:23:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,7 @@ #include <wakeupevent.hxx> -namespace presentation +namespace slideshow { namespace internal { @@ -64,7 +64,7 @@ namespace presentation bool WakeupEvent::fire() { - if( !mpActivity.get() ) + if( !mpActivity ) return false; return mrActivityQueue.addActivity( mpActivity ); |