diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:06:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:06:58 +0000 |
| commit | d9efaa0ca51692979f06b768b180f07051cdbb50 (patch) | |
| tree | 83493bf3bb837af7057b915513d36bd76addf9f0 /slideshow/source/engine/animationnodes | |
| parent | 4a56d1f550fa39706989f9fa07fc08ca990de27f (diff) | |
INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED
2008/04/21 07:54:35 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/source/engine/animationnodes')
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationcolornode.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index 0f59cbcbd667..2e3fc84716ae 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: animationcolornode.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -60,7 +60,7 @@ public: HSLWrapper( const ColorAnimationSharedPtr& rAnimation ) : mpAnimation( rAnimation ) { - ENSURE_AND_THROW( + ENSURE_OR_THROW( mpAnimation, "HSLWrapper::HSLWrapper(): Invalid color animation delegate" ); } @@ -128,7 +128,7 @@ AnimationActivitySharedPtr AnimationColorNode::createActivity() const mxColorNode ); default: - ENSURE_AND_THROW( false, "AnimationColorNode::createColorActivity(): " + ENSURE_OR_THROW( false, "AnimationColorNode::createColorActivity(): " "Unexpected color space" ); } |