diff options
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 22 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 22 |
2 files changed, 37 insertions, 7 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 26ac932a7765..4e692e570784 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -126,6 +126,7 @@ public: void testLandscapeOrientationXLSX(); void testInlineArrayXLS(); + void testEmbeddedChartODS(); void testEmbeddedChartXLS(); void testCellAnchoredGroupXLS(); @@ -235,6 +236,7 @@ public: CPPUNIT_TEST(testAllRowsHiddenXLSX); CPPUNIT_TEST(testLandscapeOrientationXLSX); CPPUNIT_TEST(testInlineArrayXLS); + CPPUNIT_TEST(testEmbeddedChartODS); CPPUNIT_TEST(testEmbeddedChartXLS); CPPUNIT_TEST(testCellAnchoredGroupXLS); @@ -323,6 +325,8 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) { BAD_CAST("office"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:office:1.0") }, { BAD_CAST("table"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:table:1.0") }, { BAD_CAST("text"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:text:1.0") }, + { BAD_CAST("style"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:style:1.0") }, + { BAD_CAST("draw"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0") }, { BAD_CAST("xlink"), BAD_CAST("http://www.w3c.org/1999/xlink") }, { BAD_CAST("xdr"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing") }, { BAD_CAST("x"), BAD_CAST("http://schemas.openxmlformats.org/spreadsheetml/2006/main") }, @@ -1922,6 +1926,24 @@ void ScExportTest::testInlineArrayXLS() xDocSh->DoClose(); } +void ScExportTest::testEmbeddedChartODS() +{ + ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS); + CPPUNIT_ASSERT(xShell.is()); + + std::shared_ptr<utl::TempFile> pTempFile( + ScBootstrapFixture::exportTo(xShell.get(), FORMAT_ODS)); + + xmlDocPtr pDoc = XPathHelper::parseExport(pTempFile, m_xSFactory, "content.xml"); + CPPUNIT_ASSERT(pDoc); + assertXPath(pDoc, + "/office:document-content/office:body/office:spreadsheet/table:table[2]/table:table-row[7]/table:table-cell[2]/draw:frame/draw:object", + "notify-on-update-of-ranges", + "Chart1.B3:Chart1.B5 Chart1.C2:Chart1.C2 Chart1.C3:Chart1.C5"); + + xShell->DoClose(); +} + void ScExportTest::testEmbeddedChartXLS() { ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS); 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 |