mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chart: don't export LO_EXT hide-legend in ODF 1.2

Browse Source 
Regressions from

commit 7869b3d6e4
(related tdf#51671, store new "hide legend"
feature also in ODF)

and

commit a96ec04a07
(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 <michael.stahl@cib.de>
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
László Németh
2020-02-13 11:20:09 +01:00
parent 69498bfcf6
commit ae7c689a80
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xmloff/source/chart/SchXMLExport.cxx
View File

@@ -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;
}