11 files changed, 15 insertions, 22 deletions
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index ea71db57a3d2..e24ba9c3ab80 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -188,7 +188,7 @@ namespace cairo
      **/
     void QuartzSurface::Resize( int width, int height )
     {
-        OSL_ENSURE(false,"not supposed to be called!");
+        OSL_FAIL("not supposed to be called!");
     }
 
 
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 8167775977c2..91cceeeea4d3 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -99,13 +99,13 @@ namespace cairocanvas
 
     ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
     ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index 47959c47afeb..752e7c74a3f8 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -172,7 +172,7 @@ namespace cairo
      **/
     void Win32Surface::Resize( int /*width*/, int /*height*/ )
     {
-        OSL_ENSURE(false,"not supposed to be called!");
+        OSL_FAIL("not supposed to be called!");
     }
 
     void Win32Surface::flush() const
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
index 82853d59c3e2..25ac0bd828b9 100644
--- a/canvas/source/directx/dx_5rm.cxx
+++ b/canvas/source/directx/dx_5rm.cxx
@@ -2176,8 +2176,7 @@ namespace dxcanvas
                 }
 
                 default:
-                    OSL_ENSURE( false,
-                                "DXRenderModule::pushVertex(): unexpected primitive types" );
+                    OSL_FAIL( "DXRenderModule::pushVertex(): unexpected primitive types" );
                     break;
             }
         }
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index a111a5f72a36..4464d1fb7781 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -1183,8 +1183,7 @@ namespace dxcanvas
                 }
 
                 default:
-                    OSL_ENSURE(false,
-                               "DXRenderModule::pushVertex(): unexpected primitive type");
+                    OSL_FAIL("DXRenderModule::pushVertex(): unexpected primitive type");
                     break;
             }
         }
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index a762053c33e1..5cb18200991d 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -91,8 +91,7 @@ namespace dxcanvas
             switch( nJoinType )
             {
                 case rendering::PathJoinType::NONE:
-                    OSL_ENSURE( false,
-                                "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" );
+                    OSL_FAIL( "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" );
                     // FALLTHROUGH intended
                 case rendering::PathJoinType::MITER:
                     return Gdiplus::LineJoinMiter;
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 313cd2b186df..13cda074ec1a 100644
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -93,8 +93,7 @@ namespace dxcanvas
         }
         catch( uno::Exception& )
         {
-            OSL_ENSURE( false,
-                        rtl::OUStringToOString(
+            OSL_FAIL( rtl::OUStringToOString(
                             comphelper::anyToString( cppu::getCaughtException() ),
                             RTL_TEXTENCODING_UTF8 ).getStr() );
         }
@@ -135,8 +134,7 @@ namespace dxcanvas
         }
         catch( uno::Exception& )
         {
-            OSL_ENSURE( false,
-                        rtl::OUStringToOString(
+            OSL_FAIL( rtl::OUStringToOString(
                             comphelper::anyToString( cppu::getCaughtException() ),
                             RTL_TEXTENCODING_UTF8 ).getStr() );
         }
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 4791c32377b6..4680cd3428df 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -205,13 +205,13 @@ namespace dxcanvas
 
     ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
     ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx
index e5291359d099..d9a7e5593e95 100644
--- a/canvas/source/tools/prioritybooster.cxx
+++ b/canvas/source/tools/prioritybooster.cxx
@@ -64,8 +64,7 @@ namespace canvas
 
             if ( 0 == SetThreadPriority( aCurrThread, mpImpl->mnOldPriority + nDelta ) )
             {
-                OSL_ENSURE( false,
-                            "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" );
+                OSL_FAIL( "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" );
             }
 #else
             (void)nDelta;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 88f473e3158f..20129ea3fe16 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -89,13 +89,13 @@ namespace vclcanvas
 
     ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
     ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
     {
-        OSL_ENSURE(false,"Not supposed to be called, handled by SpriteCanvas");
+        OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
         return sal_False;
     }
 
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 21e59a566488..e4226fac1f16 100755
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -167,8 +167,7 @@ namespace vclcanvas
 #ifndef QUARTZ
                     if( aMask.GetBitCount() != 1 )
                     {
-                        OSL_ENSURE(false,
-                                   "CanvasCustomSprite::redraw(): Mask bitmap is not "
+                        OSL_FAIL("CanvasCustomSprite::redraw(): Mask bitmap is not "
                                    "monochrome (performance!)");
                         aMask.MakeMono(255);
                     }