summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-01 14:42:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-07 07:12:39 +0100
commit8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 (patch)
treed41feeea533127280e0503d0dc2dd55a4ab83ce8 /connectivity
parent4f810905fa74128871f2fe924a3d28a79f4e4261 (diff)
log nice exception messages whereever possible
Change-Id: Idd125c18bee1a39b9ea8cc4f8c55cddfd37c33e1 Reviewed-on: https://gerrit.libreoffice.org/68579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/Library_dbpool2.mk1
-rw-r--r--connectivity/source/commontools/parameters.cxx21
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx4
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx4
4 files changed, 21 insertions, 9 deletions
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 0e1d1fc19a3f..38b3cd197f01 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
dbtools \
sal \
salhelper \
+ tl \
))
$(eval $(call gb_Library_add_exception_objects,dbpool2,\
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index e03c6064c7cf..8ab930dc2d3f 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -197,7 +197,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::collectInnerParameters: caught an exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::collectInnerParameters: caught an exception! " << exceptionToString(ex) );
}
}
}
@@ -426,7 +427,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::analyzeFieldLinks: caught an exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::analyzeFieldLinks: caught an exception! " << exceptionToString(ex) );
}
}
@@ -664,7 +666,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while calling the handler!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while calling the handler! " << exceptionToString(ex) );
}
if ( !pParams->wasSelected() )
@@ -694,7 +697,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while propagating the values!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while propagating the values! " << exceptionToString(ex) );
}
return true;
}
@@ -788,7 +792,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::cacheConnectionInfo: caught an exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::cacheConnectionInfo: caught an exception! " << exceptionToString(ex) );
}
}
@@ -844,7 +849,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::getParentColumns: caught an exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::getParentColumns: caught an exception! " << exceptionToString(ex) );
}
return _out_rxParentColumns.is();
}
@@ -940,7 +946,8 @@ namespace dbtools
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: caught an exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: caught an exception! " << exceptionToString(ex) );
}
}
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 3318e89c7d91..86393c6319ce 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -364,7 +365,8 @@ Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Ref
}
catch(Exception&)
{
- SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught an exception while retrieving the node!");
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught an exception while retrieving the node! " << exceptionToString(ex));
}
return xNode;
}
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index ac234f608016..500a3034ec94 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -32,6 +32,7 @@
#include <file/FDriver.hxx>
#include <file/FTable.hxx>
#include <comphelper/processfactory.hxx>
+#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
using namespace com::sun::star::ucb;
@@ -147,7 +148,8 @@ namespace
}
catch( const Exception& )
{
- SAL_WARN( "connectivity.drivers", "isCaseSensitiveParentFolder: caught an unexpected exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "connectivity.drivers", "isCaseSensitiveParentFolder: caught an unexpected exception! " << exceptionToString(ex) );
}
return nIsCS;