diff options
Diffstat (limited to 'connectivity/source/commontools')
4 files changed, 8 insertions, 7 deletions
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 510736cc6a3f..09b80f62653c 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -433,7 +433,7 @@ OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xC } catch (const Exception& ) { - OSL_FAIL("DBTypeConversion::getValue: caught an exception while asking for the format key!"); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "DBTypeConversion::getValue: caught an exception while asking for the format key!"); } if (!nKey) diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index f15237d82c88..2efc4a6976b3 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdb/SQLErrorEvent.hpp> #include <strings.hrc> #include <resource/sharedresources.hxx> +#include <tools/diagnose_ex.h> namespace dbtools { @@ -197,7 +198,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons case TYPE::SQLWarning: aAppend <<= SQLWarning(); break; case TYPE::SQLContext: aAppend <<= SQLContext(); break; default: - OSL_FAIL( "SQLExceptionInfo::append: invalid exception type: this will crash!" ); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "SQLExceptionInfo::append: invalid exception type: this will crash!" ); break; } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index a94a99a6327c..d8ce3f42136e 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -345,7 +345,7 @@ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceN } catch(Exception&) { - OSL_FAIL("::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!"); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "::dbtools::getConnection_withFeedback: unexpected (non-SQL) exception caught!"); } return xReturn; } @@ -463,7 +463,7 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, } catch(Exception&) { - OSL_FAIL("EXception when we set the new active connection!"); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "EXception when we set the new active connection!"); } } } @@ -717,7 +717,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect catch( const SQLException& e ) { if ( _pErrorInfo ) *_pErrorInfo = SQLExceptionInfo( e ); } catch( const Exception& ) { - OSL_FAIL( "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" ); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "::dbtools::getFieldsByCommandDescriptor: caught an exception while retrieving the fields!" ); } return xFields; @@ -1284,7 +1284,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( } catch( const Exception& ) { - OSL_FAIL( "::getCurrentSettingsComposer : caught an exception !" ); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "::getCurrentSettingsComposer : caught an exception !" ); } return xReturn; diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 8ab37a3f76f3..f34ad6228532 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -211,7 +211,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_FAIL( "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" ); + TOOLS_WARN_EXCEPTION( "connectivity.commontools", "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" ); } bool bDecDiffers = ( nCtxDecSep != nFmtDecSep ); |