diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-05 16:20:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-09 08:46:34 +0200 |
commit | 48fbfe38f60de731ff8bec0372179bedd6670af4 (patch) | |
tree | 2a1bbc4a2207d049d38c058d7f4ebb06a4f01182 /chart2/source/model/filter | |
parent | 115a8539038ecdd5e496fb6c84101c5b14d11068 (diff) |
use more DBG_UNHANDLED_EXCEPTION
so we get nice logs of the exception dynamic type for UNO exceptions.
Change-Id: Ic0b10dc14d354a2c9a0591b3a51d2f1640d54bdb
Reviewed-on: https://gerrit.libreoffice.org/52465
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model/filter')
-rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index b18207ac277c..b45b0fb23b5d 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/document/GraphicObjectResolver.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -117,9 +118,9 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( xProp->setPropertyValue( "MediaType", uno::Any( _sMediaType )); } } - catch (const uno::Exception& ex) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << ex ); + DBG_UNHANDLED_EXCEPTION("chart2"); } return xStorage; } @@ -170,9 +171,9 @@ uno::Reference< embed::XStorage > lcl_getReadStorage( OSL_ENSURE( xStorage.is(), "No Storage" ); } - catch (const uno::Exception& ex) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << ex ); + DBG_UNHANDLED_EXCEPTION("chart2"); } return xStorage; @@ -390,9 +391,9 @@ ErrCode XMLFilter::impl_Import( xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); } } - catch (const uno::Exception& ex) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << ex ); + DBG_UNHANDLED_EXCEPTION("chart2"); // something went awry nWarning = ERRCODE_SFX_GENERAL; @@ -500,9 +501,9 @@ ErrCode XMLFilter::impl_ImportStream( catch (const io::IOException&) { } - catch (const uno::Exception& rEx) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << rEx); + DBG_UNHANDLED_EXCEPTION("chart2"); } } @@ -644,9 +645,9 @@ ErrCode XMLFilter::impl_Export( if ( xTransact.is() ) xTransact->commit(); } - catch (const uno::Exception& ex) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << ex ); + DBG_UNHANDLED_EXCEPTION("chart2"); // something went awry nWarning = ERRCODE_SFX_GENERAL; @@ -687,9 +688,9 @@ ErrCode XMLFilter::impl_ExportStream( xStreamProp->setPropertyValue( "Compressed", uno::Any( true ) );//@todo? xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::Any( true ) ); } - catch (const uno::Exception& rEx) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << rEx ); + DBG_UNHANDLED_EXCEPTION("chart2"); } xActiveDataSource->setOutputStream(xOutputStream); @@ -717,9 +718,9 @@ ErrCode XMLFilter::impl_ExportStream( xFilter->filter(m_aMediaDescriptor); } - catch (const uno::Exception& rEx) + catch (const uno::Exception&) { - SAL_WARN("chart2", "Exception caught. " << rEx ); + DBG_UNHANDLED_EXCEPTION("chart2"); } return ERRCODE_NONE; } |