diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:55 +0000 |
| commit | a23557d0921e92cddecd0475952dc87e441ca536 (patch) | |
| tree | c4d4a6728a98f17cf078caf3c05144265fc24fd9 /slideshow | |
| parent | 7012d06de0a47d6621ae0d366eb00bf8b052e46e (diff) | |
INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED
2008/04/21 07:54:14 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED
2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/nodetools.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index 183328a4d795..d0124639f55c 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: nodetools.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -75,12 +75,12 @@ namespace slideshow AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, const uno::Reference< drawing::XShape >& xShape ) { - ENSURE_AND_THROW( rShapeManager, + ENSURE_OR_THROW( rShapeManager, "lookupAttributableShape(): invalid ShapeManager" ); ShapeSharedPtr pShape( rShapeManager->lookupShape( xShape ) ); - ENSURE_AND_THROW( pShape, + ENSURE_OR_THROW( pShape, "lookupAttributableShape(): no shape found for given XShape" ); AttributableShapeSharedPtr pRes( @@ -89,7 +89,7 @@ namespace slideshow // 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, + ENSURE_OR_THROW( pRes, "lookupAttributableShape(): shape found does not implement AttributableShape interface" ); return pRes; |