From bdf346830b735aa484fba0df94be71fd1ea5cdfd Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 21 Sep 2022 11:11:47 +0300 Subject: [PATCH] tdf#151100: xText->getString() may be empty for content needing export The check that is removed prevents collecting the table data. Assume that it's the performance optimization, and that processing empty text objects would be fast anyway. This basically reverts commit 73fcb052edf1a21d785583bc53e8b4323b577bb1 Author Christian Lippka Date Thu Nov 22 12:26:35 2001 +0000 #90330# only export text autostyles for shapes with text and commit 7661bbbaef31adfdb298b1447301b24a70f85834 Author Michael Stahl Date Fri Nov 25 22:46:34 2016 +0100 tdf#102479 ODF export: ignore exceptions when checking shape text that becomes unnecessary after the former change is reverted. Change-Id: I709a7b4c5ac1cc0621d3a1b18f2eb74feb987efb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140313 Tested-by: Mike Kaganski Reviewed-by: Mike Kaganski --- sw/qa/extras/odfexport/data/tdf151100.docx | Bin 0 -> 17741 bytes sw/qa/extras/odfexport/odfexport2.cxx | 14 ++++++++++++++ xmloff/source/draw/shapeexport.cxx | 15 --------------- 3 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 sw/qa/extras/odfexport/data/tdf151100.docx diff --git a/sw/qa/extras/odfexport/data/tdf151100.docx b/sw/qa/extras/odfexport/data/tdf151100.docx new file mode 100644 index 0000000000000000000000000000000000000000..e0341bdb9c8ca860a905615bb889b90b71a89ebe GIT binary patch literal 17741 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 N-#^5oiSM^x{|^_eBq0C* literal 0 HcmV?d00001 diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx index d51bc245a4c3..629d2ebf6bc6 100644 --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -520,6 +520,20 @@ CPPUNIT_TEST_FIXTURE(Test, tdf150927) assertXPath(pXmlDoc, "/office:document-styles/office:automatic-styles/style:style[@style:family='table']", 2); } +CPPUNIT_TEST_FIXTURE(Test, tdf151100) +{ + // Similar to tdf135942 + + loadAndReload("tdf151100.docx"); + // All table autostyles should be collected, including nested, and must not crash. + + CPPUNIT_ASSERT_EQUAL(1, getPages()); + + xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"); + + assertXPath(pXmlDoc, "/office:document-styles/office:automatic-styles/style:style[@style:family='table']", 1); +} + DECLARE_ODFEXPORT_TEST(testGutterLeft, "gutter-left.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 14297f25a424..f975e4d1d1b2 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -307,22 +307,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( xPropSet.is() && bObjSupportsText ) { uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY); - 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() );