diff options
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 7c1c9cb206bb..88cc1efd9782 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2774,14 +2774,6 @@ 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); @@ -2846,6 +2838,13 @@ void XMLShapeExport::ImpExportOLE2Shape( enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : XML_OBJECT_OLE ; SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, true, true ); + // tdf#112547 export text as child of draw:object, where import expects it + if (!bIsEmptyPresObj && supportsText(eShapeType)) + { + // #i118485# Add text export, the draw OLE shape allows text now + ImpExportText( xShape, TextPNS::EXTENSION ); + } + if(bExportEmbedded && !bIsEmptyPresObj) { if(bInternal) |