diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:11:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:11:52 +0000 |
| commit | d3e56874811ba27b833fbbfcc0036d818f9e9398 (patch) | |
| tree | 2ec9434f43221b92460352033c341497cb2200d6 | |
| parent | e5eac580bfaeb35d82d0d101876e58ce4a6f161c (diff) | |
INTEGRATION: CWS presfixes09 (1.7.2); FILE MERGED
2006/10/18 19:47:27 thb 1.7.2.5: RESYNC: (1.7-1.8); FILE MERGED
2006/04/12 22:25:46 thb 1.7.2.4: #i37778# Fixed typo (statement was negated)
2006/04/12 20:40:02 thb 1.7.2.3: #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:05 thb 1.7.2.2: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:16 thb 1.7.2.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
| -rw-r--r-- | slideshow/source/engine/activitiesqueue.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 79895ca30e31..d3c7e2967457 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -4,9 +4,9 @@ * * $RCSfile: activitiesqueue.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:22:40 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:11:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,9 +38,8 @@ // must be first #include <canvas/debug.hxx> -#ifndef _CANVAS_VERBOSETRACE_HXX #include <canvas/verbosetrace.hxx> -#endif + #include <comphelper/scopeguard.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -56,7 +55,7 @@ using namespace ::com::sun::star; -namespace presentation +namespace slideshow { namespace internal { @@ -91,9 +90,9 @@ namespace presentation bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity ) { - OSL_ENSURE( pActivity.get() != NULL, "ActivitiesQueue::addActivity: activity ptr NULL" ); + OSL_ENSURE( pActivity, "ActivitiesQueue::addActivity: activity ptr NULL" ); - if( pActivity.get() == NULL ) + if( !pActivity ) return false; // add entry to waiting list |