From c64a901829e5dedf12422edfb6bb7bc94a8357a5 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sat, 12 Mar 2011 11:41:23 +0100
Subject: Move OSL_ENSURE(false,...) to OSL_FAIL(...)

---
 slideshow/source/engine/activities/activitiesfactory.cxx | 7 +++----
 slideshow/source/engine/activities/interpolation.hxx     | 9 +++------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'slideshow/source/engine/activities')

diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 9308d0b80217..c29a385855ce 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -661,8 +661,7 @@ AnimationActivitySharedPtr createActivity(
         catch( ParseError& )
         {
             // parse error, thus no formula
-            OSL_ENSURE( false,
-                        "createActivity(): Error parsing formula string" );
+            OSL_FAIL( "createActivity(): Error parsing formula string" );
         }
     }
 
@@ -728,7 +727,7 @@ AnimationActivitySharedPtr createActivity(
             }
 
             default:
-                OSL_ENSURE( false, "createActivity(): unexpected case" );
+                OSL_FAIL( "createActivity(): unexpected case" );
                 // FALLTHROUGH intended
             case animations::AnimationCalcMode::PACED:
                 // FALLTHROUGH intended
@@ -796,7 +795,7 @@ AnimationActivitySharedPtr createActivity(
             }
 
             default:
-                OSL_ENSURE( false, "createActivity(): unexpected case" );
+                OSL_FAIL( "createActivity(): unexpected case" );
                 // FALLTHROUGH intended
             case animations::AnimationCalcMode::PACED:
                 // FALLTHROUGH intended
diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx
index 12fa27ffb1ea..a8baa1e3832c 100644
--- a/slideshow/source/engine/activities/interpolation.hxx
+++ b/slideshow/source/engine/activities/interpolation.hxx
@@ -56,8 +56,7 @@ namespace basegfx
                                                 const sal_Int16&    rTo,
                                                 double                     )
         {
-            OSL_ENSURE( false,
-                        "lerp<sal_Int16> called" );
+            OSL_FAIL( "lerp<sal_Int16> called" );
             return rTo;
         }
 
@@ -66,8 +65,7 @@ namespace basegfx
                                                             const ::rtl::OUString&  rTo,
                                                             double                       )
         {
-            OSL_ENSURE( false,
-                        "lerp<::rtl::OUString> called" );
+            OSL_FAIL( "lerp<::rtl::OUString> called" );
             return rTo;
         }
 
@@ -76,8 +74,7 @@ namespace basegfx
                                       const bool&   rTo,
                                       double             )
         {
-            OSL_ENSURE( false,
-                        "lerp<bool> called" );
+            OSL_FAIL( "lerp<bool> called" );
             return rTo;
         }
     }
-- 
cgit