oox/source/ppt/pptshape.cxx | 2 -- svx/source/unodraw/unoshape.cxx | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-)
New commits: commit d406404c798c4686c8f765927a68bee3f445805d Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Wed Aug 4 13:47:24 2021 +0200 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Wed Aug 4 15:50:24 2021 +0200 Log unhandled exceptions Change-Id: I1674730620b9c130b5a640bc0e67b72394752a22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119980 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 57fd337ed7af..ed1865dc5448 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -53,6 +53,7 @@ #include <svx/unoapi.hxx> #include <svx/svdomeas.hxx> #include <svx/svdpool.hxx> +#include <tools/diagnose_ex.h> #include <tools/stream.hxx> #include <tools/gen.hxx> #include <tools/UnitConversion.hxx> @@ -1792,8 +1793,14 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& { setPropertyValue( *pNames, *pValues ); } - catch( beans::UnknownPropertyException& ) {} - catch( uno::Exception& ) {} + catch (beans::UnknownPropertyException&) + { + DBG_UNHANDLED_EXCEPTION("svx"); + } + catch (uno::Exception&) + { + DBG_UNHANDLED_EXCEPTION("svx"); + } } } else @@ -1807,8 +1814,14 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& { xSet->setPropertyValue( *pNames, *pValues ); } - catch( beans::UnknownPropertyException& ) {} - catch( uno::Exception& ) {} + catch (beans::UnknownPropertyException&) + { + DBG_UNHANDLED_EXCEPTION("svx"); + } + catch (uno::Exception&) + { + DBG_UNHANDLED_EXCEPTION("svx"); + } } } commit 96256693d647b17513e08929e612466c88afef53 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Wed Aug 4 12:41:04 2021 +0200 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Wed Aug 4 15:50:08 2021 +0200 Duplicating checks Change-Id: Ie4df9a0287876d12d320060468f635cea759d305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119978 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 4b735ea59c01..7e120b8ec36e 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -357,8 +357,6 @@ void PPTShape::addShape( if (pPlaceholder) { SAL_INFO("oox.ppt","found placeholder with index: " << getSubTypeIndex().get() << " and type: " << lclDebugSubType( mnSubType )); - } - if (pPlaceholder) { PPTShape* pPPTPlaceholder = dynamic_cast< PPTShape* >( pPlaceholder.get() ); TextListStylePtr pNewTextListStyle = std::make_shared<TextListStyle>();