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

5 files changed, 10 insertions, 16 deletions

diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 63af204f8ddc..b19ee6a3683f 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -271,7 +271,7 @@ bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !!
     }
     else
     {
-        OSL_ENSURE(false, "Could not get absolute file URL for URL");
+        OSL_FAIL("Could not get absolute file URL for URL");
         return false;
     }
 }
@@ -359,7 +359,7 @@ PathStatus checkStatusAndNormalizeURL(OUString & _sURL)
         if (eStatus == Bootstrap::PATH_EXISTS)
         {
             if (!implNormalizeURL(_sURL,aDirItem))
-                OSL_ENSURE(false,"Unexpected failure getting actual URL for existing object");
+                OSL_FAIL("Unexpected failure getting actual URL for existing object");
         }
     }
     return eStatus;
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 9d13d10223b0..b7dac4dcfab9 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -756,7 +756,7 @@ void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eF
                 break;
             }
         }
-        OSL_ENSURE(false, "Cannot create absolute pathes: missing interface");
+        OSL_FAIL("Cannot create absolute pathes: missing interface");
         // make local pathes instaed
 
     case CONFIG_NAME_LOCAL_PATH:
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 24f7977bcc4e..144d53dd4401 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -356,23 +356,19 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
     switch(eProp)
     {
         case INSTALLPATH:
-            OSL_ENSURE( false,
-                        "ConfigManager::GetDirectConfigProperty: "
+            OSL_FAIL( "ConfigManager::GetDirectConfigProperty: "
                         "INSTALLPATH no longer supported." );
             return Any();
         case USERINSTALLURL:
-            OSL_ENSURE( false,
-                        "ConfigManager::GetDirectConfigProperty: "
+            OSL_FAIL( "ConfigManager::GetDirectConfigProperty: "
                         "USERINSTALLURL no longer supported." );
             return Any();
         case OFFICEINSTALL:
-            OSL_ENSURE( false,
-                        "ConfigManager::GetDirectConfigProperty: "
+            OSL_FAIL( "ConfigManager::GetDirectConfigProperty: "
                         "OFFICEINSTALL no longer supported." );
             return Any();
         case OFFICEINSTALLURL:
-            OSL_ENSURE( false,
-                        "ConfigManager::GetDirectConfigProperty: "
+            OSL_FAIL( "ConfigManager::GetDirectConfigProperty: "
                         "OFFICEINSTALLURL no longer supported." );
             return Any();
         default:
diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx
index fd813d4c7a9a..5c35e112bad0 100644
--- a/unotools/source/config/configpathes.cxx
+++ b/unotools/source/config/configpathes.cxx
@@ -98,7 +98,7 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
     // strip trailing slash
     if (nPos > 0 && _sInPath[ nPos ] == sal_Unicode('/'))
     {
-        OSL_ENSURE(false, "Invalid config path: trailing '/' is not allowed");
+        OSL_FAIL("Invalid config path: trailing '/' is not allowed");
         --nPos;
     }
 
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index bc6f3c493aff..d851102d2d23 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -280,8 +280,7 @@ SvtInetOptions::Impl::Impl():
     for (sal_Int32 i = 0; i < ENTRY_COUNT; ++i)
         aKeys[i] = m_aEntries[i].m_aName;
     if (!EnableNotification(aKeys))
-        OSL_ENSURE(false,
-                   "SvtInetOptions::Impl::Impl(): Bad EnableNotifications()");
+        OSL_FAIL("SvtInetOptions::Impl::Impl(): Bad EnableNotifications()");
 }
 
 //============================================================================
@@ -330,8 +329,7 @@ star::uno::Any SvtInetOptions::Impl::getProperty(Index nPropIndex)
             }
         }
     }
-    OSL_ENSURE(false,
-               "SvtInetOptions::Impl::getProperty(): Possible life lock");
+    OSL_FAIL("SvtInetOptions::Impl::getProperty(): Possible life lock");
     {
         osl::MutexGuard aGuard(m_aMutex);
         return m_aEntries[nPropIndex].m_aValue;