From 33b83f47a3101bc1c7b0622487cf523e6b5cf076 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 19 May 2020 14:42:46 +0200 Subject: sc: ODF export: OFFICE-3665 table:name on source-cell-range It turns out that commit d840c7e15402dc3a133b400b113e28c0c78702c5 is pointless because this attribute was actually added in ODF 1.3, which i didn't notice before; this means there's no benefit to add a loext:name at this point. Change-Id: Ic4c7a00f62e399f232a6e515ab83cd9ad99c01e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94501 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sc/source/filter/xml/XMLExportDataPilot.cxx | 5 ++--- sc/source/filter/xml/xmldpimp.cxx | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index c2e9cfa6edf3..e0cb6833db27 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -835,12 +835,11 @@ void ScXMLExportDataPilot::WriteDataPilots() if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) { if (pSheetSource->HasRangeName()) - { + { // ODF 1.3 OFFICE-3665 // FIXME this was wrongly exported to TABLE namespace since 2011 + // so continue doing that in ODF 1.2 extended, for now rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, pSheetSource->GetRangeName()); - rExport.AddAttribute( - XML_NAMESPACE_LO_EXT, XML_NAME, pSheetSource->GetRangeName()); } } diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 881e58ee84ed..15dd638deaeb 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -756,7 +756,6 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, pDataPilotTable->SetSourceCellRangeAddress(aSourceRangeAddress); } break; - case XML_ELEMENT( LO_EXT, XML_NAME ): case XML_ELEMENT( TABLE, XML_NAME ): pDataPilotTable->SetSourceRangeName(aIter.toString()); break; -- cgit