5 files changed, 7 insertions, 12 deletions
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
index 000cc41e90ce..152c15ccdf3a 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 fde5f3bfd394..aaae34e64198 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;
     }