summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-11-25 22:46:34 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-12-05 09:13:35 +0000
commite1dcbd0f7f6bacafcbdb6e74d29af2151120bc6f (patch)
tree3ed982baa78d242f3f006dd33f9fa8ab75e24dd8
parent6546ff4786f428556643410b0a0a109e802b7b70 (diff)
tdf#102479 ODF export: ignore exceptions when checking shape text
The bugdoc contains a SwXShape-SwXTextFrame aggregate which contains only a table, no top-level paragraph. Because of that, SwXTextFrame::createTextCursor() throws a RuntimeException. Assuming that the exception itself is intentional, work around it in XMLShapeExport::collectShapeAutoStyles() and assume that the getString() check that was added there in commit 73fcb052edf1a21d785583bc53e8b4323b577bb1 is just a performance optimization; the actual export of auto styles and content uses XEnumerationAccess anyway. Change-Id: I7c23164b1e692ce16e5b4e03dd945e46768677de Reviewed-on: https://gerrit.libreoffice.org/31218 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 7661bbbaef31adfdb298b1447301b24a70f85834) Reviewed-on: https://gerrit.libreoffice.org/31378 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--xmloff/source/draw/shapeexport.cxx17
1 files changed, 16 insertions, 1 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index ed70149d0574..04fb1772064f 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -302,7 +302,22 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
if( xPropSet.is() && bObjSupportsText )
{
uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY);
- if(xText.is() && !xText->getString().isEmpty())
+ bool bSkip = false;
+ if (xText.is())
+ {
+ try
+ {
+ bSkip = xText->getString().isEmpty();
+ }
+ catch (uno::RuntimeException const&)
+ {
+ // tdf#102479: SwXTextFrame that contains only a table will
+ // throw, but the table must be iterated so that
+ // SwXMLExport::ExportTableLines() can find its auto styles
+ // so do not skip it!
+ }
+ }
+ if (!bSkip)
{
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );