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 /writerfilter | |
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 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 | ||||
-rw-r--r-- | writerfilter/source/dmapper/ModelEventListener.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 5 |
5 files changed, 23 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 6219b7c672e1..c600e007320a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -77,6 +77,7 @@ #include "SectionColumnHandler.hxx" #include "GraphicHelpers.hxx" #include <dmapper/GraphicZOrderHelper.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; using namespace oox; @@ -129,9 +130,9 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon const uno::Reference<task::XInteractionHandler> xHandler; xDocumentMetadataAccess->loadMetadataFromStorage(xStorage, xBaseURI, xHandler); } - catch (const uno::Exception& rException) + catch (const uno::Exception&) { - SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize RDF metadata: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter", "failed to initialize RDF metadata"); } if (eDocumentType == SourceDocumentType::OOXML) { @@ -146,9 +147,9 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(OUString("Calibri"))); xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), css::uno::Any(double(11))); } - catch (const uno::Exception& rException) + catch (const uno::Exception&) { - SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize default font: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter", "failed to initialize default font"); } } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 7755480dffed..b03847b6c036 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -91,6 +91,7 @@ #include <comphelper/propertysequence.hxx> #include <unotools/configmgr.hxx> #include <unotools/mediadescriptor.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -1959,9 +1960,9 @@ void DomainMapper_Impl::PushAnnotation() m_aTextAppendStack.push(TextAppendContext(uno::Reference< text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW ), m_bIsNewDoc ? uno::Reference<text::XTextCursor>() : xAnnotationText->createTextCursorByRange(xAnnotationText->getStart()))); } - catch( const uno::Exception& rException) + catch( const uno::Exception&) { - SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter.dmapper"); } } @@ -2851,9 +2852,9 @@ void DomainMapper_Impl::ChainTextFrames() } m_vTextFramesForChaining.clear(); //clear the vector } - catch (const uno::Exception& rException) + catch (const uno::Exception&) { - SAL_WARN("writerfilter.dmapper", "failed. message: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter.dmapper"); } } @@ -5335,9 +5336,9 @@ void DomainMapper_Impl::ExecuteFrameConversion() m_xFrameEndRange, comphelper::containerToSequence(m_aFrameProperties) ); } - catch( const uno::Exception& rEx) + catch( const uno::Exception&) { - SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " << rEx ); + DBG_UNHANDLED_EXCEPTION( "writerfilter.dmapper", "Exception caught when converting to frame"); } } m_xFrameStartRange = nullptr; diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx index 2b403d435676..b3a73cc6b9de 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/text/ReferenceFieldSource.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/view/XFormLayerAccess.hpp> +#include <tools/diagnose_ex.h> namespace writerfilter { namespace dmapper { @@ -85,9 +86,9 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) xRefreshable->refresh(); } } - catch( const uno::Exception& rEx ) + catch( const uno::Exception& ) { - SAL_WARN("writerfilter", "exception while updating indexes: " << rEx); + DBG_UNHANDLED_EXCEPTION("writerfilter", "exception while updating indexes"); } } diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 85c635fc3b32..ca2042b11c28 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <comphelper/sequence.hxx> #include <comphelper/propertyvalue.hxx> +#include <tools/diagnose_ex.h> #include "PropertyMapHelper.hxx" using namespace com::sun::star; @@ -512,9 +513,9 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( const un } } - catch ( const uno::Exception& rException ) + catch ( const uno::Exception& ) { - SAL_WARN( "writerfilter", "SectionPropertyMap::GetPageStyle() failed: " << rException ); + DBG_UNHANDLED_EXCEPTION( "writerfilter" ); } return xRet; @@ -1223,9 +1224,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { HandleIncreasedAnchoredObjectSpacing(rDM_Impl); } - catch (const uno::Exception& rException) + catch (const uno::Exception&) { - SAL_WARN("writerfilter", "HandleIncreasedAnchoredObjectSpacing() failed: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter", "HandleIncreasedAnchoredObjectSpacing() failed"); } if ( m_nLnnMod ) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index b947fbd86728..3fe88227d92f 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -42,6 +42,7 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/string.hxx> #include <comphelper/sequence.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -1232,9 +1233,9 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) } } } - catch( const uno::Exception& rException ) + catch( const uno::Exception& ) { - SAL_WARN("writerfilter", "Styles could not be imported completely: " << rException); + DBG_UNHANDLED_EXCEPTION("writerfilter", "Styles could not be imported completely"); } } |