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

3 files changed, 10 insertions, 20 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index d95bfeb24c9f..914a94e5822b 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -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() );
 
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index de03dc3c90bf..eefa2674b867 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -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 );
             }
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 6b5899f96017..8c671889280d 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -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;
                             }
                         }