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

---
 ucbhelper/source/provider/configureucb.cxx |  7 +++----
 ucbhelper/source/provider/provconf.cxx     | 33 ++++++++++--------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx
index 2b858d614c78..ae30c6b5b350 100644
--- a/ucbhelper/source/provider/configureucb.cxx
+++ b/ucbhelper/source/provider/configureucb.cxx
@@ -174,14 +174,14 @@ configureUcb(
     if (rArguments.getLength() < 2
         || !(rArguments[0] >>= aKey1) || !(rArguments[1] >>= aKey2))
     {
-        OSL_ENSURE(false, "ucb::configureUcb(): Bad arguments");
+        OSL_FAIL("ucb::configureUcb(): Bad arguments");
         return false;
     }
 
     ContentProviderDataList aData;
     if (!getContentProviderData(rServiceFactory, aKey1, aKey2, aData))
     {
-        OSL_ENSURE(false, "ucb::configureUcb(): No configuration");
+        OSL_FAIL("ucb::configureUcb(): No configuration");
         return false;
     }
 
@@ -207,8 +207,7 @@ configureUcb(
                 pInfos->push_back(aInfo);
         }
         else
-            OSL_ENSURE(false,
-                       "ucb::configureUcb(): Bad argument placeholders");
+            OSL_FAIL("ucb::configureUcb(): Bad argument placeholders");
     }
 
     return true;
diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx
index 542ddf9351ae..3e89f9f70b4b 100644
--- a/ucbhelper/source/provider/provconf.cxx
+++ b/ucbhelper/source/provider/provconf.cxx
@@ -99,8 +99,7 @@ bool getContentProviderData(
 {
     if ( !rServiceMgr.is() || !rKey1.getLength() || !rKey2.getLength() )
     {
-        OSL_ENSURE( false,
-                    "getContentProviderData - Invalid argument!" );
+        OSL_FAIL( "getContentProviderData - Invalid argument!" );
         return false;
     }
 
@@ -114,8 +113,7 @@ bool getContentProviderData(
 
         if ( !xConfigProv.is() )
         {
-            OSL_ENSURE( false,
-                        "getContentProviderData - No config provider!" );
+            OSL_FAIL( "getContentProviderData - No config provider!" );
             return false;
         }
 
@@ -141,8 +139,7 @@ bool getContentProviderData(
 
         if ( !xInterface.is() )
         {
-            OSL_ENSURE( false,
-                        "getContentProviderData - No config access!" );
+            OSL_FAIL( "getContentProviderData - No config access!" );
             return false;
         }
 
@@ -151,8 +148,7 @@ bool getContentProviderData(
 
         if ( !xNameAccess.is() )
         {
-            OSL_ENSURE( false,
-                        "getContentProviderData - No XNameAccess!" );
+            OSL_FAIL( "getContentProviderData - No XNameAccess!" );
             return false;
         }
 
@@ -167,8 +163,7 @@ bool getContentProviderData(
 
             if ( !xHierNameAccess.is() )
             {
-                OSL_ENSURE( false,
-                            "getContentProviderData - "
+                OSL_FAIL( "getContentProviderData - "
                             "No XHierarchicalNameAccess!" );
                 return false;
             }
@@ -192,8 +187,7 @@ bool getContentProviderData(
                     if ( !( xHierNameAccess->getByHierarchicalName(
                                 aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
                     {
-                        OSL_ENSURE( false,
-                                    "getContentProviderData - "
+                        OSL_FAIL( "getContentProviderData - "
                                     "Error getting item value!" );
                         continue;
                     }
@@ -207,8 +201,7 @@ bool getContentProviderData(
                     if ( !( xHierNameAccess->getByHierarchicalName(
                                 aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
                     {
-                        OSL_ENSURE( false,
-                                    "getContentProviderData - "
+                        OSL_FAIL( "getContentProviderData - "
                                     "Error getting item value!" );
                         continue;
                     }
@@ -222,8 +215,7 @@ bool getContentProviderData(
                     if ( !( xHierNameAccess->getByHierarchicalName(
                                 aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
                     {
-                        OSL_ENSURE( false,
-                                    "getContentProviderData - "
+                        OSL_FAIL( "getContentProviderData - "
                                     "Error getting item value!" );
                         continue;
                     }
@@ -237,8 +229,7 @@ bool getContentProviderData(
                 {
                     // getByHierarchicalName
 
-                    OSL_ENSURE( false,
-                                "getContentProviderData - "
+                    OSL_FAIL( "getContentProviderData - "
                                 "caught NoSuchElementException!" );
                 }
             }
@@ -246,16 +237,14 @@ bool getContentProviderData(
     }
     catch ( uno::RuntimeException& )
     {
-        OSL_ENSURE( false,
-                    "getContentProviderData - caught RuntimeException!" );
+        OSL_FAIL( "getContentProviderData - caught RuntimeException!" );
         return false;
     }
     catch ( uno::Exception& )
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_ENSURE( false,
-                    "getContentProviderData - caught Exception!" );
+        OSL_FAIL( "getContentProviderData - caught Exception!" );
         return false;
     }
 
-- 
cgit v1.2.3