Move OSL_ENSURE(false,...) to OSL_FAIL(...)

This commit is contained in:
Thomas Arnhold
2011-03-12 11:47:36 +01:00
parent e6216e1ce6
commit d86e9a3906
59 changed files with 119 additions and 158 deletions

View File

@@ -2684,8 +2684,7 @@ namespace cppcanvas
break;
default:
OSL_ENSURE( false,
"Unknown meta action type encountered" );
OSL_FAIL( "Unknown meta action type encountered" );
break;
}
@@ -3136,8 +3135,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
OSL_ENSURE( false,
rtl::OUStringToOString(
OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -3198,8 +3196,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
OSL_ENSURE( false,
rtl::OUStringToOString(
OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );

View File

@@ -728,8 +728,7 @@ namespace cppcanvas
bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
OSL_ENSURE( false,
"TextAction::render(): Subset not supported by this object" );
OSL_FAIL( "TextAction::render(): Subset not supported by this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -760,8 +759,7 @@ namespace cppcanvas
::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
OSL_ENSURE( false,
"TextAction::getBounds(): Subset not supported by this object" );
OSL_FAIL( "TextAction::getBounds(): Subset not supported by this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -966,8 +964,7 @@ namespace cppcanvas
bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
OSL_ENSURE( false,
"EffectTextAction::render(): Subset not supported by this object" );
OSL_FAIL( "EffectTextAction::render(): Subset not supported by this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -1003,8 +1000,7 @@ namespace cppcanvas
::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
OSL_ENSURE( false,
"EffectTextAction::getBounds(): Subset not supported by this object" );
OSL_FAIL( "EffectTextAction::getBounds(): Subset not supported by this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -1923,8 +1919,7 @@ namespace cppcanvas
::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
OSL_ENSURE( false,
"OutlineAction::getBounds(): Subset not yet supported by this object" );
OSL_FAIL( "OutlineAction::getBounds(): Subset not yet supported by this object" );
return getBounds( rTransformation );
}

View File

@@ -299,8 +299,7 @@ namespace cppcanvas
nRotate,
nShearX ) )
{
OSL_ENSURE( false,
"TransparencyGroupAction::render(): non-decomposable transformation" );
OSL_FAIL( "TransparencyGroupAction::render(): non-decomposable transformation" );
return false;
}
@@ -403,8 +402,7 @@ namespace cppcanvas
break;
default:
OSL_ENSURE( false,
"Unknown meta action type encountered" );
OSL_FAIL( "Unknown meta action type encountered" );
break;
}
}