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

23 files changed, 64 insertions, 68 deletions

diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index acf6324a10f4..9f3476bd1c3e 100755
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -73,7 +73,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" );
+            OSL_FAIL( "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" );
         }
     }
 
@@ -87,7 +87,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startPropertyListening: caught an exception!" );
+            OSL_FAIL( "OAutoConnectionDisposer::startPropertyListening: caught an exception!" );
         }
     }
 
@@ -108,7 +108,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" );
+            OSL_FAIL( "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" );
         }
     }
 
@@ -123,7 +123,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startRowSetListening: caught an exception!" );
+            OSL_FAIL( "OAutoConnectionDisposer::startRowSetListening: caught an exception!" );
         }
         m_bRSListening = sal_True;
     }
@@ -138,7 +138,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" );
+            OSL_FAIL( "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" );
         }
         m_bRSListening = sal_False;
     }
@@ -220,7 +220,7 @@ namespace dbtools
         }
         catch(Exception&)
         {
-            OSL_ENSURE(sal_False, "OAutoConnectionDisposer::clearConnection: caught an exception!");
+            OSL_FAIL("OAutoConnectionDisposer::clearConnection: caught an exception!");
         }
     }
     //---------------------------------------------------------------------
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 37d1fa51a440..b11657fcc89e 100755
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -313,7 +313,7 @@ Reference< XConnection > getConnection_allowException(
             }
             catch(Exception&)
             {
-                OSL_ENSURE(sal_False, "dbtools::getConnection: error while retrieving data source properties!");
+                OSL_FAIL("dbtools::getConnection: error while retrieving data source properties!");
             }
             if(bPwdReq && !sPwd.getLength())
             {   // password required, but empty -> connect using an interaction handler
@@ -354,7 +354,7 @@ Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rData
     }
     catch(Exception&)
     {
-        OSL_ENSURE(sal_False, "::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!");
+        OSL_FAIL("::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!");
     }
     return xReturn;
 }
@@ -745,7 +745,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                     }
                     catch( const Exception& )
                     {
-                        OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: could not set the MaxRows!" );
+                        OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: could not set the MaxRows!" );
                         // oh damn. Not much of a chance to recover, we will no retrieve the complete
                         // full blown result set
                     }
@@ -760,7 +760,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                 break;
 
                 default:
-                    OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: oops! unhandled state here!" );
+                    OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: oops! unhandled state here!" );
                     eState = FAILED;
             }
         }
@@ -770,7 +770,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
     catch( const SQLException& e ) { if ( _pErrorInfo ) *_pErrorInfo = SQLExceptionInfo( e ); }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" );
+        OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" );
     }
 
     return xFields;
@@ -1067,7 +1067,7 @@ try
                     ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
                     sMessage += pResult->Name;
                     sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
-                    OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
+                    OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
 #endif
                 }
             }
@@ -1262,7 +1262,7 @@ try
 }
 catch(const Exception&)
 {
-    OSL_ENSURE( sal_False, "TransferFormComponentProperties: caught an exception!" );
+    OSL_FAIL( "TransferFormComponentProperties: caught an exception!" );
 }
 }
 
@@ -1382,7 +1382,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "::getCurrentSettingsComposer : caught an exception !" );
+        OSL_FAIL( "::getCurrentSettingsComposer : caught an exception !" );
     }
 
     return xReturn;
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 09ebd2096b9c..870727b23b3b 100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -227,7 +227,7 @@ namespace dbtools
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "ParameterManager::collectInnerParameters: caught an exception!" );
+                OSL_FAIL( "ParameterManager::collectInnerParameters: caught an exception!" );
             }
         }
     }
@@ -417,7 +417,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::analyzeFieldLinks: caught an exception!" );
+            OSL_FAIL( "ParameterManager::analyzeFieldLinks: caught an exception!" );
         }
     }
 
@@ -574,7 +574,7 @@ namespace dbtools
                 // does the name denote a valid column in the parent?
                 if ( !_rxParentColumns->hasByName( *pMasterFields ) )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
+                    OSL_FAIL( "ParameterManager::fillLinkedParameters: invalid master names should have been stripped long before!" );
                     continue;
                 }
 
@@ -584,7 +584,7 @@ namespace dbtools
                     || ( aParamInfo->second.aInnerIndexes.empty() )
                     )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
+                    OSL_FAIL( "ParameterManager::fillLinkedParameters: nothing known about this detail field!" );
                     continue;
                 }
 
@@ -623,8 +623,7 @@ namespace dbtools
                     }
                     catch( const Exception& )
                     {
-                        OSL_ENSURE( sal_False,
-                                    ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+                        OSL_FAIL( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
                                 +=  ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
                                 +=  ::rtl::OString( " could not be filled!" ) );
                     }
@@ -665,7 +664,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while calling the handler!" );
+            OSL_FAIL( "ParameterManager::completeParameters: caught an exception while calling the handler!" );
         }
 
         if ( !pParams->wasSelected() )
@@ -695,7 +694,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::completeParameters: caught an exception while propagating the values!" );
+            OSL_FAIL( "ParameterManager::completeParameters: caught an exception while propagating the values!" );
         }
         return true;
     }
@@ -766,7 +765,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::getConnection: could not retrieve the connection of the !" );
+            OSL_FAIL( "ParameterManager::getConnection: could not retrieve the connection of the !" );
         }
         return _rxConnection.is();
     }
@@ -789,7 +788,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::cacheConnectionInfo: caught an exception!" );
+            OSL_FAIL( "ParameterManager::cacheConnectionInfo: caught an exception!" );
         }
     }
 
@@ -845,7 +844,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::getParentColumns: caught an exception!" );
+            OSL_FAIL( "ParameterManager::getParentColumns: caught an exception!" );
         }
         return _out_rxParentColumns.is();
     }
@@ -900,7 +899,7 @@ namespace dbtools
                 {
                     // if this name is unknown in the parent columns, then we don't have a source
                     // for copying the value to the detail columns
-                    OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: this should have been stripped long before!" );
+                    OSL_FAIL( "ParameterManager::resetParameterValues: this should have been stripped long before!" );
                     continue;
                 }
 
@@ -912,7 +911,7 @@ namespace dbtools
                     || ( aParamInfo->second.aInnerIndexes.empty() )
                     )
                 {
-                    OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: nothing known about this detail field!" );
+                    OSL_FAIL( "ParameterManager::resetParameterValues: nothing known about this detail field!" );
                     continue;
                 }
 
@@ -944,7 +943,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ParameterManager::resetParameterValues: caught an exception!" );
+            OSL_FAIL( "ParameterManager::resetParameterValues: caught an exception!" );
         }
 
     }
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index b652f2662cf9..cc12fb78e4c9 100755
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -141,7 +141,7 @@ namespace param
                 return pProperties->Name;
         }
 
-        OSL_ENSURE( sal_False, "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" );
+        OSL_FAIL( "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" );
         return ::rtl::OUString();
     }
 
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 2a95477918c7..b53be005a019 100755
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -93,7 +93,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OPredicateInputController::getSeparatorChars: caught an exception!" );
+            OSL_FAIL( "OPredicateInputController::getSeparatorChars: caught an exception!" );
         }
         return sal_False;
     }
@@ -133,7 +133,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OPredicateInputController::OPredicateInputController: caught an exception!" );
+            OSL_FAIL( "OPredicateInputController::OPredicateInputController: caught an exception!" );
         }
     }
 
@@ -226,7 +226,7 @@ namespace dbtools
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" );
+                    OSL_FAIL( "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" );
                 }
 
                 sal_Bool bDecDiffers = ( nCtxDecSep != nFmtDecSep );
@@ -343,7 +343,7 @@ namespace dbtools
                             sReturn = pOdbcSpec->getChild(1)->getTokenValue();
                         }
                         else
-                            OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" );
+                            OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" );
                     }
                     else
                     {
@@ -376,7 +376,7 @@ namespace dbtools
                             );
                     }
                     else
-                        OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" );
+                        OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" );
                 }
 
                 delete pParseNode;
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index ba8ba3819e47..7730b8d4833f 100755
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -212,7 +212,7 @@ namespace dbtools
                     break;
 
                     default:
-                        OSL_ENSURE(sal_False, "lcl_ensureUpToDateComposer_nothrow: no table, no query, no statement - what else ?!");
+                        OSL_FAIL("lcl_ensureUpToDateComposer_nothrow: no table, no query, no statement - what else ?!");
                         break;
                 }
 
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 97f3eeee6a0c..40824f1444e3 100755
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -233,7 +233,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt
                 xDriver = new ODriverWrapper(xDriverProxy, pConnectionPool);
             }
             else
-                OSL_ENSURE(sal_False, "OConnectionPool::getDriverByURL: could not instantiate a proxy factory!");
+                OSL_FAIL("OConnectionPool::getDriverByURL: could not instantiate a proxy factory!");
         }
     }
 
@@ -363,7 +363,7 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::O
     }
     catch(const Exception&)
     {
-        OSL_ENSURE(sal_False, "createWithServiceFactory: error while instantiating the provider service!");
+        OSL_FAIL("createWithServiceFactory: error while instantiating the provider service!");
     }
     return xInterface;
 }
@@ -382,7 +382,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
             Reference< XServiceInfo > xSI(_rxConfProvider, UNO_QUERY);
             if (!xSI.is())
             {
-                OSL_ENSURE(sal_False, "::createWithProvider: no XServiceInfo interface on the provider!");
+                OSL_FAIL("::createWithProvider: no XServiceInfo interface on the provider!");
             }
             else
             {
@@ -392,7 +392,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(sal_False, "::createWithProvider: unable to check the service conformance of the provider given!");
+            OSL_FAIL("::createWithProvider: unable to check the service conformance of the provider given!");
         }
     }
 #endif
@@ -413,7 +413,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
         }
         catch(Exception&)
         {
-            OSL_ENSURE(sal_False, "OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!");
+            OSL_FAIL("OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!");
         }
     }
     return xInterface;
@@ -430,25 +430,24 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co
         if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath))
         {
             if (!::cppu::extractInterface(xNode, xDirectAccess->getByName(_rPath)))
-                OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
+                OSL_FAIL("OConfigurationNode::openNode: could not open the node!");
         }
         else if (xHierarchyAccess.is())
         {
             if (!::cppu::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath)))
-                OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
+                OSL_FAIL("OConfigurationNode::openNode: could not open the node!");
         }
 
     }
     catch(const NoSuchElementException&)
     {
-        OSL_ENSURE(sal_False,
-                    ::rtl::OString("::openNode: there is no element named ")
+        OSL_FAIL(::rtl::OString("::openNode: there is no element named ")
                 +=  ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US)
                 +=  ::rtl::OString("!"));
     }
     catch(Exception&)
     {
-        OSL_ENSURE(sal_False, "OConfigurationNode::openNode: caught an exception while retrieving the node!");
+        OSL_FAIL("OConfigurationNode::openNode: caught an exception while retrieving the node!");
     }
     return xNode;
 }
@@ -472,8 +471,7 @@ Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference<
     catch(NoSuchElementException& e)
     {
         OSL_UNUSED( e );    // make compiler happy
-        OSL_ENSURE(sal_False,
-            ::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
+        OSL_FAIL(::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
         +=  ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
         +=  ::rtl::OString("!"));
     }
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index a5bb2c190186..200884e4de98 100755
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -577,8 +577,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
                 {
 // we can not assert here because we could be in d&d
 /*
-                    OSL_ENSURE(sal_False,
-                        (   ::rtl::OString("getTypeInfoFromType: assuming column type ")
+                    OSL_FAIL((  ::rtl::OString("getTypeInfoFromType: assuming column type ")
                         +=  ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding())
                         +=  ::rtl::OString("\" (expected type name ")
                         +=  ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding())
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 3d6168116212..531d2a913aa2 100755
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -99,7 +99,7 @@ OPreparedStatement::~OPreparedStatement()
 {
     if (m_pParameters)
     {
-        OSL_ENSURE( sal_False, "OPreparedStatement::~OPreparedStatement: not disposed!" );
+        OSL_FAIL( "OPreparedStatement::~OPreparedStatement: not disposed!" );
         m_pParameters->Release();
         m_pParameters = NULL;
     }
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index feb6074eff61..e8c7a41cd0bc 100755
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -112,7 +112,7 @@ void OResultSet::construct()
     osl_incrementInterlockedCount( &m_refCount );
     if (!m_pRecordSet)
     {
-        OSL_ENSURE( sal_False, "OResultSet::construct: no RecordSet!" );
+        OSL_FAIL( "OResultSet::construct: no RecordSet!" );
         Reference< XInterface > xInt( *this );
         osl_decrementInterlockedCount( &m_refCount );
         ::dbtools::throwFunctionSequenceException( xInt );
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index efb6735c318d..2ea1cb58b718 100755
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -735,7 +735,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     catch( const Exception& e )
     {
         bModified = sal_True;   // will ensure that the property is set
-        OSL_ENSURE( sal_False, "OStatement_Base::convertFastPropertyValue: caught something strange!" );
+        OSL_FAIL( "OStatement_Base::convertFastPropertyValue: caught something strange!" );
         (void)e;
     }
     return bModified;
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 7d005bbf5fbe..425276ae3dda 100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -198,7 +198,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OColumnAlias::setAlias: could not read my driver's configuration data!" );
+            OSL_FAIL( "OColumnAlias::setAlias: could not read my driver's configuration data!" );
         }
     }
 
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 2181de964ac4..6f7e05cb6b04 100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -96,7 +96,7 @@ namespace connectivity
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
+                OSL_FAIL( "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
             }
 
             // outta here
@@ -149,7 +149,7 @@ namespace connectivity
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "getFullPathExportingCommand: caught an exception!" );
+                    OSL_FAIL( "getFullPathExportingCommand: caught an exception!" );
                 }
             }
             return sFullPathExportingCommand;
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index b276b1f06ff0..b60225907277 100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -474,7 +474,7 @@ sal_Bool OEvoabFolderList::seekRow(IResultSetHelper::Movement eCursorPosition)
             break;
 
         default:
-            OSL_ENSURE( sal_False, "OEvoabFolderList::seekRow: unsupported positioning!" );
+            OSL_FAIL( "OEvoabFolderList::seekRow: unsupported positioning!" );
             break;
     }
 
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 70df1622e8b1..a8cd887bc26b 100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -663,7 +663,7 @@ sal_Bool OEvoabTable::setColumnAliases()
                 }
             }
             else
-                OSL_ENSURE( sal_False, "OEvoabTable::setColumnAliases: did not find one of the aliases!" );
+                OSL_FAIL( "OEvoabTable::setColumnAliases: did not find one of the aliases!" );
         }
         if(!bFound)
             aColumnFinalName = aColumnReadName;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 4a98491450ba..f1ad57ceb0c4 100755
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -175,7 +175,7 @@ namespace
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "isCaseSensitiveParentFolder: caught an unexpected exception!" );
+            OSL_FAIL( "isCaseSensitiveParentFolder: caught an unexpected exception!" );
         }
 
         return nIsCS;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 58d6baad649e..5ad8ed3356e7 100755
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1725,7 +1725,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
         }
         catch (Exception&)
         {
-            OSL_ENSURE(sal_False, "OResultSet::setBoundedColumns: caught an Exception!");
+            OSL_FAIL("OResultSet::setBoundedColumns: caught an Exception!");
         }
     }
     // in this case we got more select columns as columns exist in the table
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 6756fd5a8447..622ba2c5a7d8 100755
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -855,7 +855,7 @@ namespace connectivity
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "lcl_getSystemLocale: caught an exception!" );
+                OSL_FAIL( "lcl_getSystemLocale: caught an exception!" );
             }
             if ( !sLocaleString.getLength() )
             {
@@ -893,7 +893,7 @@ namespace connectivity
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ODriverDelegator::onConnectedNewDatabase: caught an exception!" );
+            OSL_FAIL( "ODriverDelegator::onConnectedNewDatabase: caught an exception!" );
         }
     }
 
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 1ef4cf3ebe74..482f1f8bdd20 100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -92,7 +92,7 @@ namespace connectivity
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
+                OSL_FAIL( "createDriverConfigNode: caught an exception while accessing the driver's config node!" );
             }
 
             // outta here
@@ -149,7 +149,7 @@ namespace connectivity
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "getDescription: caught an exception!" );
+                    OSL_FAIL( "getDescription: caught an exception!" );
                 }
             }
             if (sDescription.getLength() == 0)
@@ -177,7 +177,7 @@ namespace connectivity
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "getPreferredProfileName: caught an exception!" );
+                    OSL_FAIL( "getPreferredProfileName: caught an exception!" );
                 }
             }
             return sPreferredName;
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 9a891affdd08..5721232a8abb 100755
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -1440,7 +1440,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
         }
         catch (Exception&)
         {
-            OSL_ENSURE(sal_False, "OResultSet::setBoundedColumns: caught an Exception!");
+            OSL_FAIL("OResultSet::setBoundedColumns: caught an Exception!");
         }
     }
 }
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 216dec207bb3..00bc6de6048e 100755
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -122,7 +122,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere
 
             if (NULL == s_pCreationFunc)
             {   // did not find the symbol
-                OSL_ENSURE(sal_False, "MozabDriver::registerClient: could not find the symbol for creating the factory!");
+                OSL_FAIL("MozabDriver::registerClient: could not find the symbol for creating the factory!");
                 osl_unloadModule(s_hModule);
                 s_hModule = NULL;
             }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 177363509305..3fe542dfb95f 100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -697,7 +697,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString&
             xResEntry->setValue( m_rColumnAlias.getProgrammaticNameOrFallbackToUTF8Alias( aDBColumnName ), rValue.getString() );
             break;
         default:
-            OSL_ENSURE( sal_False, "invalid data type!" );
+            OSL_FAIL( "invalid data type!" );
             break;
     }
 
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index e541cc2f5dec..c3122159ccc3 100755
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -418,7 +418,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
     }
     catch (Exception&)
     {
-        OSL_ENSURE(sal_False, "OSDBCDriverManager::initializeDriverPrecedence: caught an exception while sorting the drivers!");
+        OSL_FAIL("OSDBCDriverManager::initializeDriverPrecedence: caught an exception while sorting the drivers!");
     }
 }