4 files changed, 12 insertions, 10 deletions
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 2f646e0535ce..922551c470af 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 
 namespace dbtools
@@ -55,7 +56,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OAutoConnectionDisposer::OAutoConnectionDisposer" );
         }
     }
 
@@ -69,7 +70,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OAutoConnectionDisposer::startPropertyListening: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OAutoConnectionDisposer::startPropertyListening" );
         }
     }
 
@@ -90,7 +91,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OAutoConnectionDisposer::stopPropertyListening" );
         }
     }
 
@@ -105,7 +106,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OAutoConnectionDisposer::startRowSetListening: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OAutoConnectionDisposer::startRowSetListening" );
         }
         m_bRSListening = true;
     }
@@ -120,7 +121,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OAutoConnectionDisposer::stopRowSetListening" );
         }
         m_bRSListening = false;
     }
@@ -202,7 +203,7 @@ namespace dbtools
         }
         catch(Exception&)
         {
-            OSL_FAIL("OAutoConnectionDisposer::clearConnection: caught an exception!");
+            TOOLS_WARN_EXCEPTION("connectivity.commontools", "OAutoConnectionDisposer::clearConnection");
         }
     }
 
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 514b026b26c9..0bf66b360378 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1184,7 +1184,7 @@ try
 }
 catch(const Exception&)
 {
-    OSL_FAIL( "TransferFormComponentProperties: caught an exception!" );
+    TOOLS_WARN_EXCEPTION( "connectivity.commontools", "TransferFormComponentProperties" );
 }
 }
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 46832ede01a3..5986595517fc 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -479,7 +479,7 @@ namespace
                         }
                         catch(SQLException&)
                         {
-                            OSL_FAIL( "lcl_createSDBCXColumn: caught an exception!" );
+                            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "lcl_createSDBCXColumn" );
                         }
                     }
 
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 3e88af4e5e62..bfe19152f281 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -30,6 +30,7 @@
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/PColumn.hxx>
 #include <comphelper/numbers.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <memory>
 
@@ -85,7 +86,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OPredicateInputController::getSeparatorChars: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OPredicateInputController::getSeparatorChars" );
         }
         return false;
     }
@@ -119,7 +120,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OPredicateInputController::OPredicateInputController: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OPredicateInputController::OPredicateInputController" );
         }
     }