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

4 files changed, 18 insertions, 34 deletions

diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index bf05913b56cc..e8d3a3aa23ab 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -657,8 +657,7 @@ namespace slideshow
 
                 virtual void setPriority( const basegfx::B1DRange& /*rRange*/ )
                 {
-                    OSL_ENSURE( false,
-                                "BitmapView::setPriority(): This method is not supposed to be called!" );
+                    OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" );
                 }
 
                 virtual ::basegfx::B2DHomMatrix getTransformation() const
@@ -668,21 +667,18 @@ namespace slideshow
 
                 virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const
                 {
-                    OSL_ENSURE( false,
-                                "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" );
+                    OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" );
                     return ::basegfx::B2DHomMatrix();
                 }
 
                 virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ )
                 {
-                    OSL_ENSURE( false,
-                                "BitmapView::setClip(): This method is not supposed to be called!" );
+                    OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" );
                 }
 
                 virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ )
                 {
-                    OSL_ENSURE( false,
-                                "BitmapView::resize(): This method is not supposed to be called!" );
+                    OSL_FAIL( "BitmapView::resize(): This method is not supposed to be called!" );
                     return false;
                 }
 
@@ -717,8 +713,7 @@ namespace slideshow
                 {
                     // TODO(E1): Might be superfluous. Nowadays,
                     // addViewLayer swallows all errors, anyway.
-                    OSL_ENSURE( false,
-                                rtl::OUStringToOString(
+                    OSL_FAIL( rtl::OUStringToOString(
                                     comphelper::anyToString( cppu::getCaughtException() ),
                                     RTL_TEXTENCODING_UTF8 ).getStr() );
 
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index 92adddce4108..b2b90cda722e 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -68,7 +68,7 @@ namespace slideshow
                 }
                 catch (uno::Exception &)
                 {
-                    OSL_ENSURE( false, rtl::OUStringToOString(
+                    OSL_FAIL( rtl::OUStringToOString(
                                     comphelper::anyToString(
                                         cppu::getCaughtException() ),
                                     RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index c644a0016cc4..38cee82b4da0 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -834,8 +834,7 @@ bool SlideImpl::implPrefetchShow()
         {
             if( !maAnimations.importAnimations( mxRootNode ) )
             {
-                OSL_ENSURE( false,
-                            "SlideImpl::implPrefetchShow(): have animation nodes, "
+                OSL_FAIL( "SlideImpl::implPrefetchShow(): have animation nodes, "
                             "but import animations failed." );
 
                 // could not import animation framework,
@@ -865,8 +864,7 @@ bool SlideImpl::implPrefetchShow()
     }
     catch( uno::Exception& )
     {
-        OSL_ENSURE(
-            false,
+        OSL_FAIL(
             rtl::OUStringToOString(
                 comphelper::anyToString(cppu::getCaughtException()),
                 RTL_TEXTENCODING_UTF8 ) );
@@ -979,8 +977,7 @@ bool SlideImpl::applyInitialShapeAttributes(
     }
     catch( uno::Exception& )
     {
-        OSL_ENSURE(
-            false,
+        OSL_FAIL(
             rtl::OUStringToOString(
                 comphelper::anyToString(cppu::getCaughtException()),
                 RTL_TEXTENCODING_UTF8 ) );
@@ -1024,8 +1021,7 @@ bool SlideImpl::applyInitialShapeAttributes(
 
             if( !pShape )
             {
-                OSL_ENSURE( false,
-                            "SlideImpl::applyInitialShapeAttributes(): no shape found for given target" );
+                OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): no shape found for given target" );
                 continue;
             }
 
@@ -1034,8 +1030,7 @@ bool SlideImpl::applyInitialShapeAttributes(
 
             if( !pAttrShape )
             {
-                OSL_ENSURE( false,
-                            "SlideImpl::applyInitialShapeAttributes(): shape found does not "
+                OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not "
                             "implement AttributableShape interface" );
                 continue;
             }
@@ -1053,8 +1048,7 @@ bool SlideImpl::applyInitialShapeAttributes(
 
                 if( !pAttrShape )
                 {
-                    OSL_ENSURE( false,
-                                "SlideImpl::applyInitialShapeAttributes(): shape found does not "
+                    OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not "
                                 "provide a subset for requested paragraph index" );
                     continue;
                 }
@@ -1075,8 +1069,7 @@ bool SlideImpl::applyInitialShapeAttributes(
                 }
                 else
                 {
-                    OSL_ENSURE( false,
-                                "SlideImpl::applyInitialShapeAttributes(): Unexpected "
+                    OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): Unexpected "
                                 "(and unimplemented) property encountered" );
                 }
             }
@@ -1151,15 +1144,13 @@ bool SlideImpl::loadShapes()
             catch( ShapeLoadFailedException& )
             {
                 // TODO(E2): Error handling. For now, bail out
-                OSL_ENSURE( false,
-                            "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
+                OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
                 return false;
 
             }
             catch( uno::Exception& )
             {
-                OSL_ENSURE( false,
-                            rtl::OUStringToOString(
+                OSL_FAIL( rtl::OUStringToOString(
                                 comphelper::anyToString( cppu::getCaughtException() ),
                                 RTL_TEXTENCODING_UTF8 ).getStr() );
 
@@ -1196,14 +1187,12 @@ bool SlideImpl::loadShapes()
     catch( ShapeLoadFailedException& )
     {
         // TODO(E2): Error handling. For now, bail out
-        OSL_ENSURE( false,
-                    "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
+        OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
         return false;
     }
     catch( uno::Exception& )
     {
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
+        OSL_FAIL( rtl::OUStringToOString(
                         comphelper::anyToString( cppu::getCaughtException() ),
                         RTL_TEXTENCODING_UTF8 ).getStr() );
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 45af355700bc..b13748fcb1c9 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -495,7 +495,7 @@ namespace slideshow
             }
             catch (uno::Exception &)
             {
-                OSL_ENSURE( false, rtl::OUStringToOString(
+                OSL_FAIL( rtl::OUStringToOString(
                                 comphelper::anyToString(
                                     cppu::getCaughtException() ),
                                 RTL_TEXTENCODING_UTF8 ).getStr() );