diff options
Diffstat (limited to 'xmloff/source/draw/shapeexport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 399544cae531..0f2194966dbb 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1505,6 +1505,13 @@ bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< bean void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape, TextPNS eExtensionNS ) { + if (eExtensionNS == TextPNS::EXTENSION) + { + if (mrExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012) + { + return; // do not export to ODF 1.1/1.2 + } + } uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY ); if( xText.is() ) { @@ -2770,6 +2777,14 @@ void XMLShapeExport::ImpExportOLE2Shape( if( !bIsEmptyPresObj || bSaveBackwardsCompatible ) { + // tdf#112005 export text *before* adding any attributes + if (!bIsEmptyPresObj && supportsText(eShapeType)) + { + // #i118485# Add text export, the draw OLE shape allows text now + // fdo#58571 chart objects don't allow text:p + ImpExportText( xShape, TextPNS::EXTENSION ); + } + if (pAttrList) { mrExport.AddAttributeList(pAttrList); @@ -2805,13 +2820,6 @@ void XMLShapeExport::ImpExportOLE2Shape( if( !sClassId.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId ); - if(supportsText(eShapeType)) - { - // #i118485# Add text export, the draw OLE shape allows text now - // fdo#58571 chart objects don't allow text:p - ImpExportText( xShape, TextPNS::EXTENSION ); - } - if(!bExportEmbedded) { // xlink:href |