summaryrefslogtreecommitdiff
path: root/animations
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 11:41:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:13:33 +0100
commitc64a901829e5dedf12422edfb6bb7bc94a8357a5 (patch)
tree29de7e95e46da1149ca8ac24022cd25b4dcefad3 /animations
parent2c5e690eb8b6aaaad0a1c57fc533e23e4164b8f0 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'animations')
-rw-r--r--animations/source/animcore/targetpropertiescreator.cxx21
1 files changed, 7 insertions, 14 deletions
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 58b132aaba75..f35151d6cac7 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -196,8 +196,7 @@ namespace animcore
{
if( !xNode.is() )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
return;
}
@@ -218,8 +217,7 @@ namespace animcore
// TODO(E1): I'm not too sure what to expect here...
if( !xIterNode->getTarget().hasValue() )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): no target on ITERATE node" );
+ OSL_FAIL( "animcore: NodeFunctor::operator(): no target on ITERATE node" );
return;
}
@@ -233,8 +231,7 @@ namespace animcore
// no shape provided. Maybe a ParagraphTarget?
if( !(xIterNode->getTarget() >>= aTarget) )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): could not extract any "
+ OSL_FAIL( "animcore: NodeFunctor::operator(): could not extract any "
"target information" );
return;
}
@@ -244,8 +241,7 @@ namespace animcore
if( !xTargetShape.is() )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
+ OSL_FAIL( "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
return;
}
}
@@ -261,8 +257,7 @@ namespace animcore
if( !::anim::for_each_childNode( xNode,
aFunctor ) )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): child node iteration failed, "
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): child node iteration failed, "
"or extraneous container nodes encountered" );
}
}
@@ -321,8 +316,7 @@ namespace animcore
if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
break;
}
@@ -333,8 +327,7 @@ namespace animcore
if( !aTarget.mxRef.is() )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
break; // invalid target XShape
}