4 files changed, 8 insertions, 4 deletions
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 06fb16c67016..aae0a4dd9f25 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 #include <map>
 
@@ -48,7 +49,7 @@ namespace svt
                     }
                     catch( const css::uno::Exception& )
                     {
-                        OSL_FAIL( "THeaderCellMapFunctorDispose: caught an exception!" );
+                        TOOLS_WARN_EXCEPTION( "svtools", "THeaderCellMapFunctorDispose" );
                     }
             }
         };
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 869dc818061c..0b1e412ea3f4 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -22,6 +22,7 @@
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <svtools/valueset.hxx>
 #include "valueimp.hxx"
 #include <comphelper/servicehelper.hxx>
@@ -1587,7 +1588,7 @@ sal_Int32 SAL_CALL SvtValueSetAcc::getAccessibleIndexInParent()
     }
     catch (const uno::Exception&)
     {
-        OSL_FAIL( "OAccessibleContextHelper::getAccessibleIndexInParent: caught an exception!" );
+        TOOLS_WARN_EXCEPTION( "svtools", "OAccessibleContextHelper::getAccessibleIndexInParent" );
     }
 
     return nRet;
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 8f07e59b999b..cd9cfba3b45a 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/streamwrap.hxx>
 #include <cppuhelper/implbase.hxx>
 
@@ -151,7 +152,7 @@ std::unique_ptr<SvStream> getImageStream(uno::Reference<uno::XComponentContext>
     }
     catch (const uno::Exception&)
     {
-        OSL_FAIL("GraphicAccess::getImageStream: caught an exception!");
+        TOOLS_WARN_EXCEPTION("svtools", "GraphicAccess::getImageStream");
         pMemBuffer.reset();
     }
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 36761da02577..fc6f38a7985e 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -37,6 +37,7 @@
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/pathoptions.hxx>
 
 #include <comphelper/processfactory.hxx>
@@ -592,7 +593,7 @@ namespace svt
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "svtools", "TemplateFolderCacheImpl::implReadFolder" );
             return false;
         }
         return true;