ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

nipick followup: add TOOLS_WARN_EXCEPTION to empty try-catch

Browse Source 
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>
This commit is contained in:
Justin Luth
2019-11-26 10:12:09 +01:00
committed by Miklos Vajna
parent fbb3514aee
commit 6ed3c7553c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oox/source/vml/vmltextbox.cxx
+5 -1
View File
@@ -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();
writerfilter/source/dmapper/DomainMapper_Impl.cxx
+8 -2
View File
@@ -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