diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:33:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:33:35 +0000 |
| commit | 1a792ade29f24076fbc6f28d24697ea5cf781a28 (patch) | |
| tree | 83394d31bd066d3185982ac7a924a3ef6c0dba7c /slideshow/source/engine/animationnodes/nodetools.cxx | |
| parent | c9f1198b26ed6c1ea9f958941b576f84269f8aef (diff) | |
INTEGRATION: CWS presfixes09 (1.4.18); FILE MERGED
2006/10/18 19:55:49 thb 1.4.18.4: RESYNC: (1.4-1.5); FILE MERGED
2006/04/12 20:40:07 thb 1.4.18.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:18 thb 1.4.18.2: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:21 thb 1.4.18.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
Diffstat (limited to 'slideshow/source/engine/animationnodes/nodetools.cxx')
| -rw-r--r-- | slideshow/source/engine/animationnodes/nodetools.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index 3b8c5f8e10e6..acc25ea2855d 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -4,9 +4,9 @@ * * $RCSfile: nodetools.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:36:08 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:33:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,9 +40,7 @@ #include <canvas/debug.hxx> #include <canvas/verbosetrace.hxx> -#ifndef _COM_SUN_STAR_ANIMATIONS_TIMING_HPP_ #include <com/sun/star/animations/Timing.hpp> -#endif #include <tools.hxx> #include <nodetools.hxx> @@ -50,7 +48,7 @@ using namespace ::com::sun::star; -namespace presentation +namespace slideshow { namespace internal { @@ -84,7 +82,7 @@ namespace presentation { ShapeSharedPtr pShape( rLayerManager->lookupShape( xShape ) ); - ENSURE_AND_THROW( pShape.get(), + ENSURE_AND_THROW( pShape, "lookupAttributableShape(): no shape found for given XShape" ); AttributableShapeSharedPtr pRes( @@ -93,7 +91,7 @@ namespace presentation // TODO(E3): Cannot throw here, people might set animation info // for non-animatable shapes from the API. AnimationNodes must catch // the exception and handle that differently - ENSURE_AND_THROW( pRes.get(), + ENSURE_AND_THROW( pRes, "lookupAttributableShape(): shape found does not implement AttributableShape interface" ); return pRes; |