use more TOOLS_WARN_EXCEPTION

Change-Id: I269f88d82680f6a969a8bf582f0ae00cc7636509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103925
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

12 files changed, 93 insertions, 97 deletions

diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index 6ceffd3cc685..c04647907bf0 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\
 	cppu \
 	cppuhelper \
 	sal \
+	tl \
 	ucbhelper \
 ))
 
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index 27406f7a9b3c..3a0a0fa32e99 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\
 	cppuhelper \
 	sal \
 	salhelper \
+	tl \
 	ucbhelper \
 ))
 
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index 5dc25f3d0229..b04e43beabac 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\
 	cppuhelper \
 	sal \
 	salhelper \
+	tl \
 	ucbhelper \
 ))
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 1ee882ff18d4..7db0b7925e02 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -27,7 +27,7 @@
 #include <memory>
 #include <unordered_map>
 #include <sal/log.hxx>
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
@@ -958,7 +958,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - caught Exception!" );
+        TOOLS_WARN_EXCEPTION("ucb", "");
         return Reference< XInterface >();
     }
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 4c7814164457..bbf471a8b317 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -29,7 +29,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <memory>
 
 using namespace com::sun::star::beans;
@@ -1284,7 +1284,7 @@ void SortedResultSet::Initialize(
     }
     catch (const SQLException&)
     {
-        OSL_FAIL( "SortedResultSet::Initialize() : Got unexpected SQLException" );
+        TOOLS_WARN_EXCEPTION("ucb", "");
     }
 
     // when we have fetched all the elements, we can create the
@@ -1632,7 +1632,7 @@ void SortedResultSet::ResortModified( EventList* pList )
     }
     catch (const SQLException&)
     {
-        OSL_FAIL( "SortedResultSet::ResortModified() : Got unexpected SQLException" );
+        TOOLS_WARN_EXCEPTION("ucb", "");
     }
 
     m_ModList.clear();
@@ -1665,7 +1665,7 @@ void SortedResultSet::ResortNew( EventList* pList )
     }
     catch (const SQLException&)
     {
-        OSL_FAIL( "SortedResultSet::ResortNew() : Got unexpected SQLException" );
+        TOOLS_WARN_EXCEPTION("ucb", "");
     }
 }
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index ef34e6a8150f..4d0a7b26fc3e 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -20,7 +20,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
@@ -419,7 +419,7 @@ BaseContent::getContentType()
             }
             catch (const sdbc::SQLException&)
             {
-                OSL_FAIL( "BaseContent::getContentType - Caught SQLException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp.file", "");
             }
         }
     }
@@ -532,7 +532,7 @@ BaseContent::createNewContent( const ContentInfo& Info )
     }
     catch (const sdbc::SQLException&)
     {
-        OSL_FAIL( "BaseContent::createNewContent - Caught SQLException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp.file", "");
         return Reference< XContent >();
     }
 
@@ -1031,7 +1031,7 @@ void BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     }
     catch (const sdbc::SQLException&)
     {
-        OSL_FAIL( "BaseContent::insert - Caught SQLException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp.file", "");
         contentTypeSet = false;
     }
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 0f78cd033707..07b5943f06ac 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -28,7 +28,7 @@
  *************************************************************************/
 #include "hierarchydata.hxx"
 
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -244,7 +244,7 @@ bool HierarchyEntry::getData( HierarchyEntryData& rData )
     {
         // getByHierarchicalName
 
-        OSL_FAIL( "HierarchyEntry::getData - caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
     return false;
 }
@@ -428,8 +428,7 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData )
     {
         // replaceByName, insertByName
 
-        OSL_FAIL(
-            "HierarchyEntry::setData - caught IllegalArgumentException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
     catch ( uno::RuntimeException const & )
     {
@@ -439,29 +438,25 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData )
     {
         // replaceByName, getByName
 
-        OSL_FAIL(
-            "HierarchyEntry::setData - caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
     catch ( container::ElementExistException const & )
     {
         // insertByName
 
-        OSL_FAIL(
-            "HierarchyEntry::setData - caught ElementExistException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
     catch ( lang::WrappedTargetException const & )
     {
         // replaceByName, insertByName, getByName, commitChanges
 
-        OSL_FAIL(
-            "HierarchyEntry::setData - caught WrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
     catch ( uno::Exception const & )
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_FAIL(
-            "HierarchyEntry::setData - caught Exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
 
     return false;
@@ -583,7 +578,7 @@ bool HierarchyEntry::move(
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_FAIL( "HierarchyEntry::move - caught Exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -620,14 +615,14 @@ bool HierarchyEntry::move(
     {
         // getByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // getByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -644,7 +639,7 @@ bool HierarchyEntry::move(
     {
         // getByName, removeByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -720,29 +715,28 @@ bool HierarchyEntry::move(
     {
         // replaceByName, insertByName, getByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::IllegalArgumentException const & )
     {
         // replaceByName, insertByName
 
-        OSL_FAIL(
-            "HierarchyEntry::move - caught IllegalArgumentException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( container::ElementExistException const & )
     {
         // insertByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught ElementExistException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // replaceByName, insertByName, getByName
 
-        OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -853,7 +847,7 @@ bool HierarchyEntry::remove()
     {
         // createInstance, createInstanceWithArguments
 
-        OSL_FAIL( "HierarchyEntry::remove - caught Exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
 
     return false;
@@ -912,12 +906,11 @@ bool HierarchyEntry::first( iterator const & it )
         {
             // getByHierarchicalName
 
-            OSL_FAIL(
-                "HierarchyEntry::first - caught NoSuchElementException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( uno::Exception const & )
         {
-            OSL_FAIL( "HierarchyEntry::first - caught Exception!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
     }
 
@@ -1034,8 +1027,7 @@ HierarchyEntry::getRootReadAccess()
             {
                 // createInstance, createInstanceWithArguments
 
-                OSL_FAIL( "HierarchyEntry::getRootReadAccess - "
-                            "caught Exception!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             }
         }
     }
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 99e81dc7700f..bf64d4d0146d 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -28,7 +28,7 @@
 
 #include <string_view>
 
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -2186,13 +2186,13 @@ bool Content::loadData( ContentProvider const * pProvider,
         catch ( lang::IllegalArgumentException const & )
         {
             // an illegal argument is provided
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             return false;
         }
         catch ( embed::InvalidStorageException const & )
         {
             // this storage is in invalid state for any reason
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             return false;
         }
     }
@@ -2247,17 +2247,17 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
         }
         catch ( beans::PropertyVetoException const & )
         {
-            OSL_FAIL( "Caught PropertyVetoException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             return false;
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             return false;
         }
         catch ( lang::WrappedTargetException const & )
         {
-            OSL_FAIL( "Caught WrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             return false;
         }
 
@@ -2302,21 +2302,21 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
             catch ( io::NotConnectedException const & )
             {
                 // readSomeBytes, writeBytes
-                OSL_FAIL( "Caught NotConnectedException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
                 closeOutputStream( xOut );
                 return false;
             }
             catch ( io::BufferSizeExceededException const & )
             {
                 // readSomeBytes, writeBytes
-                OSL_FAIL( "Caught BufferSizeExceededException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
                 closeOutputStream( xOut );
                 return false;
             }
             catch ( io::IOException const & )
             {
                 // readSomeBytes, writeBytes
-                OSL_FAIL( "Caught IOException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
                 closeOutputStream( xOut );
                 return false;
             }
@@ -2370,37 +2370,37 @@ void Content::renameData(
     catch ( embed::InvalidStorageException const & )
     {
         // this storage is in invalid state for any reason
-        OSL_FAIL( "Caught InvalidStorageException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
     catch ( lang::IllegalArgumentException const & )
     {
         // an illegal argument is provided
-        OSL_FAIL( "Caught IllegalArgumentException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
     catch ( container::NoSuchElementException const & )
     {
         // there is no element with old name in this storage
-        OSL_FAIL( "Caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
     catch ( container::ElementExistException const & )
     {
         // an element with new name already exists in this storage
-        OSL_FAIL( "Caught ElementExistException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
     catch ( io::IOException const & )
     {
         // in case of io errors during renaming
-        OSL_FAIL( "Caught IOException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
     catch ( embed::StorageWrappedTargetException const & )
     {
         // wraps other exceptions
-        OSL_FAIL( "Caught StorageWrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return;
     }
 
@@ -2434,31 +2434,31 @@ bool Content::removeData()
     catch ( embed::InvalidStorageException const & )
     {
         // this storage is in invalid state for any reason
-        OSL_FAIL( "Caught InvalidStorageException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::IllegalArgumentException const & )
     {
         // an illegal argument is provided
-        OSL_FAIL( "Caught IllegalArgumentException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( container::NoSuchElementException const & )
     {
         // there is no element with this name in this storage
-        OSL_FAIL( "Caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( io::IOException const & )
     {
         // in case of io errors during renaming
-        OSL_FAIL( "Caught IOException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( embed::StorageWrappedTargetException const & )
     {
         // wraps other exceptions
-        OSL_FAIL( "Caught StorageWrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -2499,37 +2499,37 @@ bool Content::copyData( const Uri & rSourceUri, const OUString & rNewName )
     catch ( embed::InvalidStorageException const & )
     {
         // this storage is in invalid state for any reason
-        OSL_FAIL( "Caught InvalidStorageException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::IllegalArgumentException const & )
     {
         // an illegal argument is provided
-        OSL_FAIL( "Caught IllegalArgumentException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( container::NoSuchElementException const & )
     {
         // there is no element with this name in this storage
-        OSL_FAIL( "Caught NoSuchElementException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( container::ElementExistException const & )
     {
         // there is no element with this name in this storage
-        OSL_FAIL( "Caught ElementExistException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( io::IOException const & )
     {
         // in case of io errors during renaming
-        OSL_FAIL( "Caught IOException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( embed::StorageWrappedTargetException const & )
     {
         // wraps other exceptions
-        OSL_FAIL( "Caught StorageWrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -2551,12 +2551,12 @@ bool Content::commitStorage( const uno::Reference< embed::XStorage > & xStorage
     }
     catch ( io::IOException const & )
     {
-        OSL_FAIL( "Caught IOException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
     catch ( lang::WrappedTargetException const & )
     {
-        OSL_FAIL( "Caught WrappedTargetException!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         return false;
     }
 
@@ -2577,15 +2577,15 @@ bool Content::closeOutputStream(
         }
         catch ( io::NotConnectedException const & )
         {
-            OSL_FAIL( "Caught NotConnectedException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::BufferSizeExceededException const & )
         {
-            OSL_FAIL( "Caught BufferSizeExceededException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
-            OSL_FAIL( "Caught IOException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
     }
     return false;
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 6713d5401ffe..53bc31a683ad 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <osl/diagnose.h>
 #include <rtl/ref.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -134,7 +134,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc )
         }
         catch ( lang::WrappedTargetException const & )
         {
-            OSL_FAIL( "Caught WrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "Caught WrappedTargetException!");
         }
     }
 
@@ -611,11 +611,11 @@ bool OfficeDocumentsManager::isBasicIDE(
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( frame::UnknownModuleException const & )
         {
-            OSL_FAIL( "Caught UnknownModuleException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
 
         if ( !aModule.isEmpty() )
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index e4a7c8ca346b..d7ee3f59aa96 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -24,7 +24,7 @@
 
  *************************************************************************/
 
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 #include <com/sun/star/embed/InvalidStorageException.hpp>
 #include <com/sun/star/embed/StorageWrappedTargetException.hpp>
@@ -330,11 +330,11 @@ ContentProvider::queryStorage( const OUString & rUri,
         }
         catch ( embed::InvalidStorageException const & )
         {
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
@@ -343,7 +343,7 @@ ContentProvider::queryStorage( const OUString & rUri,
         }
         catch ( embed::StorageWrappedTargetException const & )
         {
-            OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
     }
     return uno::Reference< embed::XStorage >();
@@ -369,11 +369,11 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const
         }
         catch ( embed::InvalidStorageException const & )
         {
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
@@ -382,7 +382,7 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const
         }
         catch ( embed::StorageWrappedTargetException const & )
         {
-            OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
     }
 
@@ -402,19 +402,19 @@ ContentProvider::queryInputStream( const OUString & rUri,
         }
         catch ( embed::InvalidStorageException const & )
         {
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
-            OSL_FAIL( "Caught IOException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( embed::StorageWrappedTargetException const & )
         {
-            OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
 //        catch ( packages::WrongPasswordException const & )
 //        {
@@ -440,11 +440,11 @@ ContentProvider::queryOutputStream( const OUString & rUri,
         }
         catch ( embed::InvalidStorageException const & )
         {
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
@@ -453,7 +453,7 @@ ContentProvider::queryOutputStream( const OUString & rUri,
         }
         catch ( embed::StorageWrappedTargetException const & )
         {
-            OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
 //        catch ( packages::WrongPasswordException const & )
 //        {
@@ -478,11 +478,11 @@ ContentProvider::queryStream( const OUString & rUri,
         }
         catch ( embed::InvalidStorageException const & )
         {
-            OSL_FAIL( "Caught InvalidStorageException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( lang::IllegalArgumentException const & )
         {
-            OSL_FAIL( "Caught IllegalArgumentException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
         catch ( io::IOException const & )
         {
@@ -491,7 +491,7 @@ ContentProvider::queryStream( const OUString & rUri,
         }
         catch ( embed::StorageWrappedTargetException const & )
         {
-            OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+            TOOLS_WARN_EXCEPTION("ucb.ucp", "");
         }
 //        catch ( packages::WrongPasswordException const & )
 //        {
@@ -535,11 +535,11 @@ bool ContentProvider::queryNamesOfChildren(
             }
             catch ( embed::InvalidStorageException const & )
             {
-                OSL_FAIL( "Caught InvalidStorageException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             }
             catch ( lang::IllegalArgumentException const & )
             {
-                OSL_FAIL( "Caught IllegalArgumentException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             }
             catch ( io::IOException const & )
             {
@@ -548,7 +548,7 @@ bool ContentProvider::queryNamesOfChildren(
             }
             catch ( embed::StorageWrappedTargetException const & )
             {
-                OSL_FAIL( "Caught embed::StorageWrappedTargetException!" );
+                TOOLS_WARN_EXCEPTION("ucb.ucp", "");
             }
         }
     }
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 96748056b166..458389e03060 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -26,7 +26,7 @@
 
  *************************************************************************/
 
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
@@ -88,7 +88,7 @@ Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext,
     }
     catch ( uno::Exception const & )
     {
-        OSL_FAIL( "Storage::Storage: Caught exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
 
     OSL_ENSURE( m_xAggProxy.is(),
@@ -478,7 +478,7 @@ OutputStream::OutputStream(
     }
     catch ( uno::Exception const & )
     {
-        OSL_FAIL( "OutputStream::OutputStream: Caught exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
 
     OSL_ENSURE( m_xAggProxy.is(),
@@ -643,7 +643,7 @@ Stream::Stream(
     }
     catch ( uno::Exception const & )
     {
-        OSL_FAIL( "OutputStream::OutputStream: Caught exception!" );
+        TOOLS_WARN_EXCEPTION("ucb.ucp", "");
     }
 
     OSL_ENSURE( m_xAggProxy.is(),
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 7e1d0e3c8cf5..490203eaffad 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -584,7 +584,8 @@ void XMLAnimationsEffectContext::endFastElement(sal_Int32 )
     }
     catch (const Exception&)
     {
-        TOOLS_WARN_EXCEPTION("xmloff.draw", "exception caught while importing animation information!");
+        TOOLS_WARN_EXCEPTION("xmloff.draw",
+                             "exception caught while importing animation information!");
     }
 }