diff options
| author | Justin Luth <justin_luth@sil.org> | 2019-11-25 21:16:13 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-26 10:12:09 +0100 |
| commit | 6ed3c7553ceebf06b316836909e71b445a8d8071 (patch) | |
| tree | c400e36750b0760ef3af5a49b274aea846d8fcf1 | |
| parent | fbb3514aee8261211790b23586752d5be9ac2f34 (diff) | |
nipick followup: add TOOLS_WARN_EXCEPTION to empty try-catch
followup for tdf#128153 docx/VML: apply style properties to shape text
Change-Id: I2e1a057cfacb610d294ed106879af89482637a3a
Reviewed-on: https://gerrit.libreoffice.org/83721
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | oox/source/vml/vmltextbox.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx index c170c8db4414..f0f4a28f72d3 100644 --- a/oox/source/vml/vmltextbox.cxx +++ b/oox/source/vml/vmltextbox.cxx @@ -21,6 +21,7 @@ #include <rtl/ustrbuf.hxx> #include <svx/unopage.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> @@ -170,7 +171,10 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const aGrabBag["mso-pStyle"] <<= sParaStyle; xPropertySet->setPropertyValue("CharInteropGrabBag", uno::makeAny(aGrabBag.getAsConstPropertyValueList())); } - catch (uno::Exception&) {} + catch (const uno::Exception&) + { + TOOLS_WARN_EXCEPTION( "oox.vml","convert() grabbag exception" ); + } // Remove the last character of the shape text, if it would be a newline. uno::Reference< text::XTextCursor > xCursor = xTextAppend->createTextCursor(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index bd93881a6a4f..58d7c19604fc 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2629,11 +2629,17 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape xSyncedPropertySet->setPropertyValue( sPropName, aProp ); } } - catch (uno::Exception&) {} + catch (const uno::Exception&) + { + TOOLS_WARN_EXCEPTION( "writerfilter.dmapper", "PushShapeContext() text stylesheet property exception" ); + } } } } - catch (uno::Exception&) {} + catch (const uno::Exception&) + { + TOOLS_WARN_EXCEPTION( "writerfilter.dmapper", "PushShapeContext()" ); + } } // A GroupShape doesn't implement text::XTextRange, but appending |