diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-09-21 11:11:47 +0300 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-10-06 01:31:59 +0200 |
| commit | 140776885c14c667717918c0405744e98a893797 (patch) | |
| tree | 617d41b9c04dd588648e4bcf036ec2072dca642b /xmloff | |
| parent | bba3ccf1270a2e851f718c7045187a388cc8532b (diff) | |
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 <cl@openoffice.org>
Date Thu Nov 22 12:26:35 2001 +0000
#90330# only export text autostyles for shapes with text
and commit 7661bbbaef31adfdb298b1447301b24a70f85834
Author Michael Stahl <mstahl@redhat.com>
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.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140313
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140352
Tested-by: Jenkins
(cherry picked from commit 226b1c2006e936e4b32748b810624c5d655c4a98)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140378
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit d194474aabd699806cb3631bc8641dd0548b8026)
Change-Id: I709a7b4c5ac1cc0621d3a1b18f2eb74feb987efb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140951
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 14ec1ca6f4d0..8af3de729146 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -303,23 +303,8 @@ 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() ); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("IsEmptyPresentationObject") ) |