From ae7c689a803aa5e8f4b9ef4881fdd60b23e4b463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Thu, 13 Feb 2020 11:20:09 +0100 Subject: [PATCH] chart: don't export LO_EXT hide-legend in ODF 1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regressions from commit 7869b3d6e4b24a0567ad2e492038d74c03b06b7d (related tdf#51671, store new "hide legend" feature also in ODF) and commit a96ec04a07c35338f5f9a0cb361b9322e5ca9cec (tdf#130225 implement ODF export of deleted legend entries of pie charts) Change-Id: I1d2847ae3e3ab7ccfbdb3841d94a0c1d79ded31f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88593 Reviewed-by: Michael Stahl Reviewed-by: László Németh Tested-by: László Németh --- xmloff/source/chart/SchXMLExport.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 12f772b0d8b5..7329d3d16d81 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2641,7 +2641,7 @@ void SchXMLExportHelper_Impl::exportSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, OUString()); const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); - if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 ) + if( nCurrentODFVersion > SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older { if (xPropSet.is()) { @@ -3195,7 +3195,7 @@ void SchXMLExportHelper_Impl::exportDataPoints( xSeriesProperties->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint; const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); - if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 ) + if( nCurrentODFVersion > SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older xSeriesProperties->getPropertyValue("DeletedLegendEntries") >>= deletedLegendEntriesSeq; }