diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-06 15:26:28 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-08 13:40:11 +0000 |
| commit | 6acc6c011d3afd6834efeee1b2efe43652a86f2e (patch) | |
| tree | 78ec792c75ed8e23605982d68392f8a1cd22c6b5 /xmloff/source/draw/shapeexport.cxx | |
| parent | 204d1093d4954596cc7d7578e0630648f1f678f5 (diff) | |
text:p is not allowed as child element of draw:frame
Regression from #i118485#.
Change-Id: Ib242ca1417f46b731d62d117132cbed6c02448fb
Reviewed-on: https://gerrit.libreoffice.org/15173
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'xmloff/source/draw/shapeexport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 2d0506c6afc0..96dfd640fb20 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1492,14 +1492,14 @@ bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< bean return bIsEmpty; } -void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape ) +void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape, TextPNS eExtensionNS ) { uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY ); if( xText.is() ) { uno::Reference< container::XEnumerationAccess > xEnumAccess( xShape, uno::UNO_QUERY ); if( xEnumAccess.is() && xEnumAccess->hasElements() ) - mrExport.GetTextParagraphExport()->exportText( xText ); + mrExport.GetTextParagraphExport()->exportText( xText, false, true, eExtensionNS ); } } @@ -2804,7 +2804,7 @@ void XMLShapeExport::ImpExportOLE2Shape( { // #i118485# Add text export, the draw OLE shape allows text now // fdo#58571 chart objects don't allow text:p - ImpExportText( xShape ); + ImpExportText( xShape, TextPNS::EXTENSION ); } if(!bExportEmbedded) |