diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-01 14:42:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-07 07:12:39 +0100 |
| commit | 8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 (patch) | |
| tree | d41feeea533127280e0503d0dc2dd55a4ab83ce8 /filter | |
| parent | 4f810905fa74128871f2fe924a3d28a79f4e4261 (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 'filter')
| -rw-r--r-- | filter/Library_icg.mk | 3 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 6 | ||||
| -rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 6 | ||||
| -rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 54d733358937..94949bb32904 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -24,7 +24,8 @@ $(eval $(call gb_Library_use_external,icg,boost_headers)) $(eval $(call gb_Library_use_sdk_api,icg)) $(eval $(call gb_Library_use_libraries,icg,\ - comphelper \ + comphelper \ + cppuhelper \ tk \ vcl \ utl \ diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index ba775e98fed8..3004d346522e 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -29,6 +29,7 @@ #include "outact.hxx" #include <memory> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -730,9 +731,10 @@ ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, css::u aXStatInd->end(); } } - catch (const css::uno::Exception& exc) + catch (const css::uno::Exception&) { - SAL_WARN("filter.icgm", exc); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("filter.icgm", exceptionToString(ex)); nStatus = 0; } } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index db483ffef04b..d4931b1eb848 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> +#include <tools/diagnose_ex.h> using namespace ::cppu; using namespace ::osl; @@ -152,9 +153,10 @@ OdfFlatXml::importer( else saxParser->parseStream(inputSource); } - catch (const Exception &exc) + catch (const Exception &) { - SAL_WARN("filter.odfflatxml", exc); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("filter.odfflatxml", exceptionToString(ex)); return false; } catch (const std::exception &exc) diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 3e5164e7af4d..bade0bdbac1a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -28,6 +28,7 @@ #include <osl/conditn.hxx> #include <rtl/strbuf.hxx> #include <tools/urlobj.hxx> +#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <comphelper/interaction.hxx> @@ -400,10 +401,11 @@ namespace XSLT m_tcontrol->terminate(); return !m_bError; } - catch( const Exception& exc) + catch( const Exception& ) { + css::uno::Any ex( cppu::getCaughtException() ); // something went wrong - SAL_WARN("filter.xslt", exc); + SAL_WARN("filter.xslt", exceptionToString(ex)); return false; } } |