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

14 files changed, 137 insertions, 240 deletions

diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 583c558a007e..a58034dddd46 100755
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -550,7 +550,7 @@ uno::Any SAL_CALL HierarchyContent::execute(
         ucb::TransferInfo aInfo;
         if ( !( aCommand.Argument >>= aInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -575,7 +575,7 @@ uno::Any SAL_CALL HierarchyContent::execute(
         ucb::ContentInfo aInfo;
         if ( !( aCommand.Argument >>= aInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -669,8 +669,7 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info )
     }
     else
     {
-        OSL_ENSURE( sal_False,
-                    "createNewContent called on non-folder object!" );
+        OSL_FAIL( "createNewContent called on non-folder object!" );
         return uno::Reference< ucb::XContent >();
     }
 }
@@ -896,15 +895,14 @@ sal_Bool HierarchyContent::exchangeIdentity(
     // Already persistent?
     if ( m_eState != PERSISTENT )
     {
-        OSL_ENSURE( sal_False,
-                    "HierarchyContent::exchangeIdentity - Not persistent!" );
+        OSL_FAIL( "HierarchyContent::exchangeIdentity - Not persistent!" );
         return sal_False;
     }
 
     // Am I the root folder?
     if ( m_eKind == ROOT )
     {
-        OSL_ENSURE( sal_False, "HierarchyContent::exchangeIdentity - "
+        OSL_FAIL( "HierarchyContent::exchangeIdentity - "
                                "Not supported by root folder!" );
         return sal_False;
     }
@@ -957,8 +955,7 @@ sal_Bool HierarchyContent::exchangeIdentity(
         }
     }
 
-    OSL_ENSURE( sal_False,
-                "HierarchyContent::exchangeIdentity - "
+    OSL_FAIL( "HierarchyContent::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
     return sal_False;
 }
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 4b8983e9e918..a3f9ed980aee 100755
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -147,7 +147,7 @@ HierarchyEntry::HierarchyEntry(
     if ( nPos > HIERARCHY_URL_SCHEME_LENGTH )
         m_aName = rURL.copy( nPos + 1 );
     else
-        OSL_ENSURE( sal_False, "HierarchyEntry - Invalid URL!" );
+        OSL_FAIL( "HierarchyEntry - Invalid URL!" );
 }
 
 //=========================================================================
@@ -196,8 +196,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             if ( !( xRootReadAccess->getByHierarchicalName( aTitlePath )
                     >>= aValue ) )
             {
-                OSL_ENSURE( sal_False,
-                            "HierarchyEntry::getData - "
+                OSL_FAIL( "HierarchyEntry::getData - "
                             "Got no Title value!" );
                 return sal_False;
             }
@@ -210,8 +209,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath )
                     >>= aValue ) )
             {
-                OSL_ENSURE( sal_False,
-                            "HierarchyEntry::getData - "
+                OSL_FAIL( "HierarchyEntry::getData - "
                             "Got no TargetURL value!" );
                 return sal_False;
             }
@@ -248,8 +246,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
                     }
                     else
                     {
-                        OSL_ENSURE( sal_False,
-                                    "HierarchyEntry::getData - "
+                        OSL_FAIL( "HierarchyEntry::getData - "
                                     "Unknown Type value!" );
                         return sal_False;
                     }
@@ -268,8 +265,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
     {
         // getByHierarchicalName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::getData - caught NoSuchElementException!" );
+        OSL_FAIL( "HierarchyEntry::getData - caught NoSuchElementException!" );
     }
     return sal_False;
 }
@@ -474,40 +470,35 @@ sal_Bool HierarchyEntry::setData(
     {
         // replaceByName, insertByName
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::setData - caught IllegalArgumentException!" );
     }
     catch ( container::NoSuchElementException const & )
     {
         // replaceByName, getByName
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::setData - caught NoSuchElementException!" );
     }
     catch ( container::ElementExistException const & )
     {
         // insertByName
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::setData - caught ElementExistException!" );
     }
     catch ( lang::WrappedTargetException const & )
     {
         // replaceByName, insertByName, getByName, commitChanges
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::setData - caught WrappedTargetException!" );
     }
     catch ( uno::Exception const & )
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::setData - caught Exception!" );
     }
 
@@ -534,7 +525,7 @@ sal_Bool HierarchyEntry::move(
         aNewKey = rNewURL.copy( nURLPos + 1 );
     else
     {
-        OSL_ENSURE( sal_False, "HierarchyEntry::move - Invalid URL!" );
+        OSL_FAIL( "HierarchyEntry::move - Invalid URL!" );
         return sal_False;
     }
 
@@ -635,7 +626,7 @@ sal_Bool HierarchyEntry::move(
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_ENSURE( sal_False, "HierarchyEntry::move - caught Exception!" );
+        OSL_FAIL( "HierarchyEntry::move - caught Exception!" );
         return sal_False;
     }
 
@@ -677,16 +668,14 @@ sal_Bool HierarchyEntry::move(
     {
         // getByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught NoSuchElementException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
         return sal_False;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // getByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught WrappedTargetException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
         return sal_False;
     }
 
@@ -703,8 +692,7 @@ sal_Bool HierarchyEntry::move(
     {
         // getByName, removeByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught NoSuchElementException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
         return sal_False;
     }
 
@@ -786,16 +774,14 @@ sal_Bool HierarchyEntry::move(
     {
         // replaceByName, insertByName, getByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught NoSuchElementException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
         return sal_False;
     }
     catch ( lang::IllegalArgumentException const & )
     {
         // replaceByName, insertByName
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::move - caught IllegalArgumentException!" );
         return sal_False;
     }
@@ -803,16 +789,14 @@ sal_Bool HierarchyEntry::move(
     {
         // insertByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught ElementExistException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught ElementExistException!" );
         return sal_False;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // replaceByName, insertByName, getByName
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::move - caught WrappedTargetException!" );
+        OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
         return sal_False;
     }
 
@@ -916,24 +900,21 @@ sal_Bool HierarchyEntry::remove()
     {
         // getByName, removeByName
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::remove - caught NoSuchElementException!" );
     }
     catch ( lang::WrappedTargetException const & )
     {
         // getByName, commitChanges
 
-        OSL_ENSURE(
-            sal_False,
+        OSL_FAIL(
             "HierarchyEntry::remove - caught WrappedTargetException!" );
     }
     catch ( uno::Exception const & )
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyEntry::remove - caught Exception!" );
+        OSL_FAIL( "HierarchyEntry::remove - caught Exception!" );
     }
 
     return sal_False;
@@ -995,14 +976,12 @@ sal_Bool HierarchyEntry::first( iterator& it )
         {
             // getByHierarchicalName
 
-            OSL_ENSURE(
-                sal_False,
+            OSL_FAIL(
                 "HierarchyEntry::first - caught NoSuchElementException!" );
         }
         catch ( uno::Exception const & )
         {
-            OSL_ENSURE( sal_False,
-                    "HierarchyEntry::first - caught Exception!" );
+            OSL_FAIL( "HierarchyEntry::first - caught Exception!" );
         }
     }
 
@@ -1081,8 +1060,7 @@ HierarchyEntry::getRootReadAccess()
         {
             if ( m_bTriedToGetRootReadAccess ) // #82494#
             {
-                OSL_ENSURE( sal_False,
-                            "HierarchyEntry::getRootReadAccess - "
+                OSL_FAIL( "HierarchyEntry::getRootReadAccess - "
                             "Unable to read any config data! -> #82494#" );
                 return uno::Reference< container::XHierarchicalNameAccess >();
             }
@@ -1126,8 +1104,7 @@ HierarchyEntry::getRootReadAccess()
             {
                 // createInstance, createInstanceWithArguments
 
-                OSL_ENSURE( sal_False,
-                            "HierarchyEntry::getRootReadAccess - "
+                OSL_FAIL( "HierarchyEntry::getRootReadAccess - "
                             "caught Exception!" );
             }
         }
@@ -1211,8 +1188,7 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const
                     }
                     else
                     {
-                        OSL_ENSURE( sal_False,
-                                    "HierarchyEntry::getData - "
+                        OSL_FAIL( "HierarchyEntry::getData - "
                                     "Unknown Type value!" );
                     }
                 }
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 9bcaafadc7e2..8573f1750930 100755
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -200,13 +200,11 @@ HierarchyContentProvider::getConfigProvider(
         }
         catch ( uno::Exception const & )
         {
-//            OSL_ENSURE( sal_False,
-//                        "HierarchyContentProvider::getConfigProvider - "
+//            OSL_FAIL( //                        "HierarchyContentProvider::getConfigProvider - "
 //                        "caught exception!" );
         }
 
-        OSL_ENSURE( sal_False,
-                    "HierarchyContentProvider::getConfigProvider - "
+        OSL_FAIL( "HierarchyContentProvider::getConfigProvider - "
                     "No config provider!" );
 
         return uno::Reference< lang::XMultiServiceFactory >();
@@ -229,8 +227,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess(
         {
             if ( (*it).second.bTriedToGetRootReadAccess ) // #82494#
             {
-                OSL_ENSURE( sal_False,
-                    "HierarchyContentProvider::getRootConfigReadNameAccess - "
+                OSL_FAIL( "HierarchyContentProvider::getRootConfigReadNameAccess - "
                     "Unable to read any config data! -> #82494#" );
                 return uno::Reference< container::XHierarchicalNameAccess >();
             }
@@ -271,8 +268,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess(
             {
                 // createInstance, createInstanceWithArguments
 
-                OSL_ENSURE( sal_False,
-                    "HierarchyContentProvider::getRootConfigReadNameAccess - "
+                OSL_FAIL( "HierarchyContentProvider::getRootConfigReadNameAccess - "
                     "caught Exception!" );
             }
         }
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index e32bbdbbfef8..05b36107e73b 100755
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -235,7 +235,7 @@ uno::Any SAL_CALL Content::execute(
         uno::Sequence< beans::Property > Properties;
         if ( !( aCommand.Argument >>= Properties ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -257,7 +257,7 @@ uno::Any SAL_CALL Content::execute(
         uno::Sequence< beans::PropertyValue > aProperties;
         if ( !( aCommand.Argument >>= aProperties ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -269,7 +269,7 @@ uno::Any SAL_CALL Content::execute(
 
         if ( !aProperties.getLength() )
         {
-            OSL_ENSURE( sal_False, "No properties!" );
+            OSL_FAIL( "No properties!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -307,7 +307,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::OpenCommandArgument2 aOpenCommand;
           if ( !( aCommand.Argument >>= aOpenCommand ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -454,7 +454,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::InsertCommandArgument arg;
           if ( !( aCommand.Argument >>= arg ) )
         {
-              OSL_ENSURE( sal_False, "Wrong argument type!" );
+              OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -477,7 +477,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::TransferInfo aTransferInfo;
         if( ! ( aCommand.Argument >>= aTransferInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(),
@@ -538,7 +538,7 @@ uno::Any SAL_CALL Content::execute(
         // Unsupported command
         //////////////////////////////////////////////////////////////////
 
-        OSL_ENSURE( sal_False, "Content::execute - unsupported command!" );
+        OSL_FAIL( "Content::execute - unsupported command!" );
 
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
@@ -952,7 +952,7 @@ void Content::insert(
     // Check, if all required properties were set.
     if ( !m_aProps->m_sTitle.getLength())
     {
-        OSL_ENSURE( sal_False, "Content::insert - property value missing!" );
+        OSL_FAIL( "Content::insert - property value missing!" );
 
         uno::Sequence< rtl::OUString > aProps( 1 );
         aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zzzz"));
@@ -967,7 +967,7 @@ void Content::insert(
 
     if ( !xInputStream.is() )
     {
-        OSL_ENSURE( sal_False, "Content::insert - No data stream!" );
+        OSL_FAIL( "Content::insert - No data stream!" );
 
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::MissingInputStreamException(
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index e501dd09fde1..00d21eced5a6 100755
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -672,7 +672,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::ContentInfo aInfo;
         if ( !( aCommand.Argument >>= aInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -789,8 +789,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     }
     else
     {
-        OSL_ENSURE( sal_False,
-                    "createNewContent called on non-folder object!" );
+        OSL_FAIL( "createNewContent called on non-folder object!" );
         return uno::Reference< ucb::XContent >();
     }
 }
@@ -2102,8 +2101,7 @@ void Content::transfer(
 
                     if ( !xNamed.is() )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "Content::transfer - Got no XNamed!" );
+                        OSL_FAIL( "Content::transfer - Got no XNamed!" );
                         break;
                     }
 
@@ -2111,8 +2109,7 @@ void Content::transfer(
 
                     if ( !aName.getLength() )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "Content::transfer - Empty name!" );
+                        OSL_FAIL( "Content::transfer - Empty name!" );
                         break;
                     }
 
@@ -2192,8 +2189,7 @@ sal_Bool Content::exchangeIdentity(
     // Already persistent?
     if ( m_eState != PERSISTENT )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::exchangeIdentity - Not persistent!" );
+        OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
         return sal_False;
     }
 
@@ -2247,8 +2243,7 @@ sal_Bool Content::exchangeIdentity(
         }
     }
 
-    OSL_ENSURE( sal_False,
-            "Content::exchangeIdentity - Panic! Cannot exchange identity!" );
+    OSL_FAIL( "Content::exchangeIdentity - Panic! Cannot exchange identity!" );
     return sal_False;
 }
 
@@ -2385,23 +2380,20 @@ sal_Bool Content::loadData(
                             "HasEncryptedEntries" )) );
                 if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::loadData - "
+                    OSL_FAIL( "Content::loadData - "
                                 "Got no HasEncryptedEntries value!" );
                     return sal_False;
                 }
             }
             catch ( beans::UnknownPropertyException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::loadData - "
+                OSL_FAIL( "Content::loadData - "
                             "Got no HasEncryptedEntries value!" );
                 return sal_False;
             }
             catch ( lang::WrappedTargetException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::loadData - "
+                OSL_FAIL( "Content::loadData - "
                             "Got no HasEncryptedEntries value!" );
                 return sal_False;
             }
@@ -2421,8 +2413,7 @@ sal_Bool Content::loadData(
 
             if ( !xPropSet.is() )
             {
-                OSL_ENSURE( sal_False,
-                        "Content::loadData - Got no XPropertySet interface!" );
+                OSL_FAIL( "Content::loadData - Got no XPropertySet interface!" );
                 return sal_False;
             }
 
@@ -2437,21 +2428,18 @@ sal_Bool Content::loadData(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 if ( !( aMediaType >>= rProps.aMediaType ) )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::loadData - Got no MediaType value!" );
+                    OSL_FAIL( "Content::loadData - Got no MediaType value!" );
                     return sal_False;
                 }
             }
             catch ( beans::UnknownPropertyException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no MediaType value!" );
+                OSL_FAIL( "Content::loadData - Got no MediaType value!" );
                 return sal_False;
             }
             catch ( lang::WrappedTargetException const & )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no MediaType value!" );
+                OSL_FAIL( "Content::loadData - Got no MediaType value!" );
                 return sal_False;
             }
 
@@ -2484,21 +2472,18 @@ sal_Bool Content::loadData(
                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) );
                     if ( !( aSize >>= rProps.nSize ) )
                     {
-                        OSL_ENSURE( sal_False,
-                                    "Content::loadData - Got no Size value!" );
+                        OSL_FAIL( "Content::loadData - Got no Size value!" );
                         return sal_False;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::loadData - Got no Size value!" );
+                    OSL_FAIL( "Content::loadData - Got no Size value!" );
                     return sal_False;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::loadData - Got no Size value!" );
+                    OSL_FAIL( "Content::loadData - Got no Size value!" );
                     return sal_False;
                 }
 
@@ -2510,21 +2495,18 @@ sal_Bool Content::loadData(
                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")) );
                     if ( !( aCompressed >>= rProps.bCompressed ) )
                     {
-                        OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Compressed value!" );
+                        OSL_FAIL( "Content::loadData - Got no Compressed value!" );
                         return sal_False;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Compressed value!" );
+                    OSL_FAIL( "Content::loadData - Got no Compressed value!" );
                     return sal_False;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Compressed value!" );
+                    OSL_FAIL( "Content::loadData - Got no Compressed value!" );
                     return sal_False;
                 }
 
@@ -2536,21 +2518,18 @@ sal_Bool Content::loadData(
                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")) );
                     if ( !( aEncrypted >>= rProps.bEncrypted ) )
                     {
-                        OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Encrypted value!" );
+                        OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
                         return sal_False;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Encrypted value!" );
+                    OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
                     return sal_False;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                            "Content::loadData - Got no Encrypted value!" );
+                    OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
                     return sal_False;
                 }
             }
@@ -2589,8 +2568,7 @@ sal_Bool Content::renameData(
 
         if ( !xNamed.is() )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::renameData - Got no XNamed interface!" );
+            OSL_FAIL( "Content::renameData - Got no XNamed interface!" );
             return sal_False;
         }
 
@@ -2670,8 +2648,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
                                                     xNA, uno::UNO_QUERY );
             if ( !xFac.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::storeData - "
+                OSL_FAIL( "Content::storeData - "
                             "Got no XSingleServiceFactory interface!" );
                 return sal_False;
             }
@@ -2684,8 +2661,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
 
             if ( !xNew.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::storeData - createInstance failed!" );
+                OSL_FAIL( "Content::storeData - createInstance failed!" );
                 return sal_False;
             }
 
@@ -2697,8 +2673,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
 
             if ( !xParentContainer.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::storeData - "
+                OSL_FAIL( "Content::storeData - "
                             "Got no XNameContainer interface!" );
                 return sal_False;
             }
@@ -2713,35 +2688,31 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         catch ( lang::IllegalArgumentException const & )
         {
             // insertByName
-            OSL_ENSURE( sal_False,
-                        "Content::storeData - insertByName failed!" );
+            OSL_FAIL( "Content::storeData - insertByName failed!" );
             return sal_False;
         }
         catch ( container::ElementExistException const & )
         {
             // insertByName
-            OSL_ENSURE( sal_False,
-                        "Content::storeData - insertByName failed!" );
+            OSL_FAIL( "Content::storeData - insertByName failed!" );
             return sal_False;
         }
         catch ( lang::WrappedTargetException const & )
         {
             // insertByName
-            OSL_ENSURE( sal_False,
-                        "Content::storeData - insertByName failed!" );
+            OSL_FAIL( "Content::storeData - insertByName failed!" );
             return sal_False;
         }
         catch ( container::NoSuchElementException const & )
         {
             // getByHierarchicalName
-            OSL_ENSURE( sal_False,
-                        "Content::storeData - getByHierarchicalName failed!" );
+            OSL_FAIL( "Content::storeData - getByHierarchicalName failed!" );
             return sal_False;
         }
         catch ( uno::Exception const & )
         {
             // createInstanceWithArguments
-            OSL_ENSURE( sal_False, "Content::storeData - Error!" );
+            OSL_FAIL( "Content::storeData - Error!" );
             return sal_False;
         }
     }
@@ -2756,8 +2727,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
 
         if ( !xPropSet.is() )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::storeData - Got no XPropertySet interface!" );
+            OSL_FAIL( "Content::storeData - Got no XPropertySet interface!" );
             return sal_False;
         }
 
@@ -2814,8 +2784,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
 
             if ( !xSink.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "Content::storeData - "
+                OSL_FAIL( "Content::storeData - "
                             "Got no XActiveDataSink interface!" );
                 return sal_False;
             }
@@ -2846,7 +2815,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         // setPropertyValue
     }
 
-    OSL_ENSURE( sal_False, "Content::storeData - Error!" );
+    OSL_FAIL( "Content::storeData - Error!" );
     return sal_False;
 }
 
@@ -2871,8 +2840,7 @@ sal_Bool Content::removeData()
 
         if ( !xContainer.is() )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::removeData - "
+            OSL_FAIL( "Content::removeData - "
                         "Got no XNameContainer interface!" );
             return sal_False;
         }
@@ -2889,7 +2857,7 @@ sal_Bool Content::removeData()
         // removeByName
     }
 
-    OSL_ENSURE( sal_False, "Content::removeData - Error!" );
+    OSL_FAIL( "Content::removeData - Error!" );
     return sal_False;
 }
 
@@ -2908,8 +2876,7 @@ sal_Bool Content::flushData()
     uno::Reference< util::XChangesBatch > xBatch( xNA, uno::UNO_QUERY );
     if ( !xBatch.is() )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::flushData - Got no XChangesBatch interface!" );
+        OSL_FAIL( "Content::flushData - Got no XChangesBatch interface!" );
         return sal_False;
     }
 
@@ -2922,7 +2889,7 @@ sal_Bool Content::flushData()
     {
     }
 
-    OSL_ENSURE( sal_False, "Content::flushData - Error!" );
+    OSL_FAIL( "Content::flushData - Error!" );
     return sal_False;
 }
 
@@ -2947,8 +2914,7 @@ uno::Reference< io::XInputStream > Content::getInputStream()
 
         if ( !xSink.is() )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::getInputStream - "
+            OSL_FAIL( "Content::getInputStream - "
                         "Got no XActiveDataSink interface!" );
             return xStream;
         }
@@ -2987,8 +2953,7 @@ uno::Reference< container::XEnumeration > Content::getIterator()
 
         if ( !xIterFac.is() )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::getIterator - "
+            OSL_FAIL( "Content::getIterator - "
                         "Got no XEnumerationAccess interface!" );
             return xIter;
         }
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index d403626ba061..589fd28b1610 100755
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -265,8 +265,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
 
             if ( !xNamed.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "DataSupplier::getResult - Got no XNamed!" );
+                OSL_FAIL( "DataSupplier::getResult - Got no XNamed!" );
                 break;
             }
 
@@ -274,8 +273,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
 
             if ( !aName.getLength() )
             {
-                OSL_ENSURE( sal_False,
-                            "DataSupplier::getResult - Empty name!" );
+                OSL_FAIL( "DataSupplier::getResult - Empty name!" );
                 break;
             }
 
@@ -345,8 +343,7 @@ sal_uInt32 DataSupplier::totalCount()
 
             if ( !xNamed.is() )
             {
-                OSL_ENSURE( sal_False,
-                            "DataSupplier::getResult - Got no XNamed!" );
+                OSL_FAIL( "DataSupplier::getResult - Got no XNamed!" );
                 break;
             }
 
@@ -354,8 +351,7 @@ sal_uInt32 DataSupplier::totalCount()
 
             if ( !aName.getLength() )
             {
-                OSL_ENSURE( sal_False,
-                            "DataSupplier::getResult - Empty name!" );
+                OSL_FAIL( "DataSupplier::getResult - Empty name!" );
                 break;
             }
 
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 27d411233225..0ac70af0e273 100755
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -251,8 +251,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString
 
     if ( !rName.getLength() )
     {
-        OSL_ENSURE( sal_False,
-                    "ContentProvider::createPackage - Invalid URL!" );
+        OSL_FAIL( "ContentProvider::createPackage - Invalid URL!" );
         return uno::Reference< container::XHierarchicalNameAccess >();
     }
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index cc859e623dae..db7686637c54 100755
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -97,8 +97,7 @@ static ContentType lcl_getContentType( const rtl::OUString & rType )
         return STREAM;
     else
     {
-        OSL_ENSURE( sal_False,
-                    "Content::Content - unsupported content type string" );
+        OSL_FAIL( "Content::Content - unsupported content type string" );
         return STREAM;
     }
 }
@@ -143,7 +142,7 @@ Content* Content::create(
          !Info.Type.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) )
     {
-        OSL_ENSURE( sal_False, "Content::create - unsupported content type!" );
+        OSL_FAIL( "Content::create - unsupported content type!" );
         return 0;
     }
 
@@ -638,7 +637,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::TransferInfo aInfo;
         if ( !( aCommand.Argument >>= aInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -681,7 +680,7 @@ uno::Any SAL_CALL Content::execute(
         ucb::ContentInfo aInfo;
         if ( !( aCommand.Argument >>= aInfo ) )
         {
-            OSL_ENSURE( sal_False, "Wrong argument type!" );
+            OSL_FAIL( "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -753,8 +752,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         // streams cannot be created as direct children of document root
         if ( !bCreateFolder && ( m_aProps.getType() == DOCUMENT ) )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::createNewContent - streams cannot be "
+            OSL_FAIL( "Content::createNewContent - streams cannot be "
                         "created as direct children of document root!" );
             return uno::Reference< ucb::XContent >();
         }
@@ -763,8 +761,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
              !Info.Type.equalsAsciiL(
                 RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) )
         {
-            OSL_ENSURE( sal_False,
-                        "Content::createNewContent - unsupported type!" );
+            OSL_FAIL( "Content::createNewContent - unsupported type!" );
             return uno::Reference< ucb::XContent >();
         }
 
@@ -788,8 +785,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     }
     else
     {
-        OSL_ENSURE( sal_False,
-                    "createNewContent called on non-contentcreator object!" );
+        OSL_FAIL( "createNewContent called on non-contentcreator object!" );
         return uno::Reference< ucb::XContent >();
     }
 }
@@ -890,8 +886,7 @@ sal_Bool Content::exchangeIdentity(
     // Already persistent?
     if ( m_eState != PERSISTENT )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::exchangeIdentity - Not persistent!" );
+        OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
         return sal_False;
     }
 
@@ -899,7 +894,7 @@ sal_Bool Content::exchangeIdentity(
     ContentType eType = m_aProps.getType();
     if ( ( eType == ROOT ) || ( eType == DOCUMENT ) )
     {
-        OSL_ENSURE( sal_False, "Content::exchangeIdentity - "
+        OSL_FAIL( "Content::exchangeIdentity - "
                                "Not supported by root or document!" );
         return sal_False;
     }
@@ -952,8 +947,7 @@ sal_Bool Content::exchangeIdentity(
         }
     }
 
-    OSL_ENSURE( sal_False,
-                "Content::exchangeIdentity - "
+    OSL_FAIL( "Content::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
     return sal_False;
 }
@@ -3114,8 +3108,7 @@ ContentProperties::getCreatableContentsInfo() const
     }
     else
     {
-        OSL_ENSURE( sal_False,
-                    "getCreatableContentsInfo called on non-contentcreator "
+        OSL_FAIL( "getCreatableContentsInfo called on non-contentcreator "
                     "object!" );
 
         return uno::Sequence< ucb::ContentInfo >( 0 );
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index a3472dfd92e0..dcfedfbb47a7 100755
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -266,8 +266,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex )
 
             if ( !rName.getLength() )
             {
-                OSL_ENSURE( sal_False,
-                            "ResultDataSupplier::getResult - Empty name!" );
+                OSL_FAIL( "ResultDataSupplier::getResult - Empty name!" );
                 break;
             }
 
@@ -327,8 +326,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount()
 
             if ( !rName.getLength() )
             {
-                OSL_ENSURE( sal_False,
-                            "ResultDataSupplier::getResult - Empty name!" );
+                OSL_FAIL( "ResultDataSupplier::getResult - Empty name!" );
                 break;
             }
 
diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx
index 896117152a1e..3376d1a3023b 100755
--- a/ucb/source/ucp/webdav/LockSequence.cxx
+++ b/ucb/source/ucp/webdav/LockSequence.cxx
@@ -174,8 +174,7 @@ extern "C" int LockSequence_chardata_callback(
                 pCtx->hasDepth = true;
             }
             else
-                OSL_ENSURE( sal_False,
-                            "LockSequence_chardata_callback - Unknown depth!" );
+                OSL_FAIL( "LockSequence_chardata_callback - Unknown depth!" );
             break;
 
         case STATE_OWNER:
@@ -222,8 +221,7 @@ extern "C" int LockSequence_chardata_callback(
             {
                 pCtx->pLock->Timeout = sal_Int64( -1 );
                 pCtx->hasTimeout = true;
-                OSL_ENSURE( sal_False,
-                            "LockSequence_chardata_callback - Unknown timeout!" );
+                OSL_FAIL( "LockSequence_chardata_callback - Unknown timeout!" );
             }
             break;
 
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 7df353ea850c..3326dd1c3231 100755
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -128,15 +128,15 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText )
 
     if ( rStatusText.getLength() < 3 )
     {
-        OSL_ENSURE(
-            sal_False, "makeStatusCode - status text string to short!" );
+        OSL_FAIL(
+            "makeStatusCode - status text string to short!" );
         return 0;
     }
 
     sal_Int32 nPos = rStatusText.indexOf( ' ' );
     if ( nPos == -1 )
     {
-        OSL_ENSURE( sal_False, "makeStatusCode - wrong status text format!" );
+        OSL_FAIL( "makeStatusCode - wrong status text format!" );
         return 0;
     }
 
@@ -320,8 +320,8 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
         rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
     if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) )
     {
-        OSL_ENSURE(
-            sal_False, "NeonSession_NeonAuth - username to long!" );
+        OSL_FAIL(
+            "NeonSession_NeonAuth - username to long!" );
         return -1;
     }
 
@@ -329,8 +329,8 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
         rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) );
     if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) )
     {
-        OSL_ENSURE(
-            sal_False, "NeonSession_NeonAuth - password to long!" );
+        OSL_FAIL(
+            "NeonSession_NeonAuth - password to long!" );
         return -1;
     }
 
@@ -1002,8 +1002,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath,
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                                "NeonSession::PROPPATCH - unsupported type!" );
+                    OSL_FAIL( "NeonSession::PROPPATCH - unsupported type!" );
                     // Error!
                     pItems[ n ].value = 0;
                     theRetVal = NE_ERROR;
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index ef76f5784c6f..56a4ca3c8513 100755
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -215,8 +215,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
 
             if ( nPos == nEnd )
             {
-                OSL_ENSURE( sal_False,
-                    "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                 return rtl::OUString();
             }
 
@@ -228,8 +227,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
 
                 if ( nPos > nEnd - 4 )
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
 
@@ -244,8 +242,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
             }
@@ -255,8 +252,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
 
                 if ( nPos > nEnd - 3 )
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
 
@@ -269,8 +265,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
             }
@@ -280,8 +275,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
 
                 if ( nPos > nEnd - 3 )
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
 
@@ -294,15 +288,13 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue )
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                    OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                     return rtl::OUString();
                 }
             }
             else
             {
-                OSL_ENSURE( sal_False,
-                    "UCBDeadPropertyValue::decodeValue - syntax error!" );
+                OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" );
                 return rtl::OUString();
             }
         }
@@ -414,8 +406,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                                "UCBDeadPropertyValue::createFromXML - "
+                    OSL_FAIL( "UCBDeadPropertyValue::createFromXML - "
                                 "Unsupported property type!" );
                     success = false;
                 }
@@ -513,8 +504,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
     }
     else
     {
-        OSL_ENSURE( sal_False,
-                    "UCBDeadPropertyValue::toXML - "
+        OSL_FAIL( "UCBDeadPropertyValue::toXML - "
                     "Unsupported property type!" );
         return false;
     }
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 2f5adff8e2d7..d933541c585e 100755
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -731,8 +731,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
     // Check property type.
     if ( !UCBDeadPropertyValue::supportsType( DefaultValue.getValueType() ) )
     {
-        OSL_ENSURE( sal_False,
-                    "Content::addProperty - Unsupported property type!" );
+        OSL_FAIL( "Content::addProperty - Unsupported property type!" );
         throw beans::IllegalTypeException();
     }
 
@@ -817,23 +816,20 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
                         break;
 
                     default:
-                        OSL_ENSURE( sal_False,
-                                    "Content::addProperty - "
+                        OSL_FAIL( "Content::addProperty - "
                                     "Unsupported resource type!" );
                         break;
                     }
                 }
                 catch ( uno::Exception const & )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::addProperty - "
+                    OSL_FAIL( "Content::addProperty - "
                                 "Unable to determine resource type!" );
                 }
             }
             else
             {
-                OSL_ENSURE( sal_False,
-                            "Content::addProperty - "
+                OSL_FAIL( "Content::addProperty - "
                             "Unable to determine resource type!" );
             }
         }
@@ -911,23 +907,20 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
                             break;
 
                         default:
-                            OSL_ENSURE( sal_False,
-                                        "Content::removeProperty - "
+                            OSL_FAIL( "Content::removeProperty - "
                                         "Unsupported resource type!" );
                             break;
                     }
                 }
                 catch ( uno::Exception const & )
                 {
-                    OSL_ENSURE( sal_False,
-                                "Content::removeProperty - "
+                    OSL_FAIL( "Content::removeProperty - "
                                 "Unable to determine resource type!" );
                 }
             }
             else
             {
-                OSL_ENSURE( sal_False,
-                            "Content::removeProperty - "
+                OSL_FAIL( "Content::removeProperty - "
                             "Unable to determine resource type!" );
 //                throw beans::UnknownPropertyException();
             }
@@ -1781,8 +1774,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         }
         catch ( DAVException const & e )
         {
-//            OSL_ENSURE( sal_False,
-//                        "Content::setPropertyValues - PROPPATCH failed!" );
+//            OSL_FAIL( //                        "Content::setPropertyValues - PROPPATCH failed!" );
 
 #if 1
             cancelCommandExecution( e, xEnv );
@@ -2234,7 +2226,7 @@ void Content::insert(
 
     if ( aEscapedTitle.getLength() == 0 )
     {
-        OSL_ENSURE( sal_False, "Content::insert - Title missing!" );
+        OSL_FAIL( "Content::insert - Title missing!" );
 
         uno::Sequence< rtl::OUString > aProps( 1 );
         aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
@@ -2312,8 +2304,7 @@ void Content::insert(
 //                            break;
 
                     default:
-                        OSL_ENSURE( sal_False,
-                                    "Content::insert - "
+                        OSL_FAIL( "Content::insert - "
                                     "Unknown interaction selection!" );
                         throw ucb::CommandFailedException(
                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -2837,7 +2828,7 @@ sal_Bool Content::exchangeIdentity(
     // Already persistent?
     if ( m_bTransient )
     {
-        OSL_ENSURE( sal_False, "Content::exchangeIdentity - Not persistent!" );
+        OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
         return sal_False;
     }
 
@@ -2886,8 +2877,7 @@ sal_Bool Content::exchangeIdentity(
         }
     }
 
-    OSL_ENSURE( sal_False,
-                "Content::exchangeIdentity - "
+    OSL_FAIL( "Content::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
     return sal_False;
 }
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 638c0c948bca..730ef432ab77 100755
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -394,7 +394,7 @@ sal_Bool DataSupplier::getData()
           }
           catch ( DAVException & )
         {
-//          OSL_ENSURE( sal_False, "PROPFIND : DAVException" );
+//          OSL_FAIL( "PROPFIND : DAVException" );
             m_pImpl->m_bThrowException = sal_True;
           }