summaryrefslogtreecommitdiff
path: root/ucb
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 /ucb
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 'ucb')
-rw-r--r--ucb/Library_ucpexpand1.mk1
-rw-r--r--ucb/source/core/ucbstore.cxx4
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx6
3 files changed, 8 insertions, 3 deletions
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index a3f5fe1b3f2c..a0af1d0ffd4e 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\
cppu \
cppuhelper \
sal \
+ tl \
ucbhelper \
))
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 74b4771b60ee..3454a7afd655 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -48,6 +48,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx>
#include <ucbhelper/getcomponentcontext.hxx>
+#include <tools/diagnose_ex.h>
#include "ucbstore.hxx"
using namespace com::sun::star::beans;
@@ -906,7 +907,8 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
}
catch (const Exception&)
{
- SAL_WARN( "ucb", "caught exception!" );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "ucb", "caught exception! " << exceptionToString(ex) );
}
}
}
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index b1d094ac31e7..49a708fdc6a8 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/util/theMacroExpander.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
+#include <tools/diagnose_ex.h>
#define EXPAND_PROTOCOL "vnd.sun.star.expand"
@@ -199,9 +200,10 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds(
OUString uri2( expandUri( xId2 ) );
return uri1.compareTo( uri2 );
}
- catch (const ucb::IllegalIdentifierException & exc)
+ catch (const ucb::IllegalIdentifierException &)
{
- SAL_WARN( "ucb", exc );
+ css::uno::Any ex( cppu::getCaughtException() );
+ SAL_WARN( "ucb", exceptionToString(ex) );
return -1;
}
}