From a96ec04a07c35338f5f9a0cb361b9322e5ca9cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCnde=20T=C3=B3th?= Date: Wed, 5 Feb 2020 13:37:00 +0100 Subject: [PATCH] tdf#130225 implement ODF export of deleted legend entries of pie charts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up of the following commits related to the new UNO property DeletedLegendEntries for pie charts: commit 86be3422cd55fa9e44104f1628648061bb6a3495 (tdf#129857 Chart OOXML export: fix deleted legend entries) commit 6e847aa817999ab18acd534f9e6a86685bb268fc (tdf#129859 XLSX import: don't show deleted legend entries) Change-Id: Id24cddefa83e50dde1ec6555d02891753483dd5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88018 Tested-by: Jenkins Reviewed-by: László Németh --- chart2/qa/extras/chart2export.cxx | 16 +++++++++++ .../docx/piechart_deleted_legend_entry.docx | Bin 0 -> 27165 bytes xmloff/source/chart/SchXMLExport.cxx | 25 +++++++++++++++++- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 19 +++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 chart2/qa/extras/data/docx/piechart_deleted_legend_entry.docx diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 5ee135f5920b..1ff1064046e1 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -153,6 +153,7 @@ public: void testTdf115012(); void testTdf123206_customLabelText(); void testDeletedLegendEntries(); + void testTdf130225(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -269,6 +270,7 @@ public: CPPUNIT_TEST(testTdf115012); CPPUNIT_TEST(testTdf123206_customLabelText); CPPUNIT_TEST(testDeletedLegendEntries); + CPPUNIT_TEST(testTdf130225); CPPUNIT_TEST_SUITE_END(); @@ -2469,6 +2471,20 @@ void Chart2ExportTest::testDeletedLegendEntries() } } +void Chart2ExportTest::testTdf130225() +{ + load("/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx"); + reload("Office Open XML Text"); + Reference xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); + CPPUNIT_ASSERT(xDataSeries.is()); + Reference xPropertySet(xDataSeries, uno::UNO_QUERY_THROW); + Sequence deletedLegendEntriesSeq; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue("DeletedLegendEntries") >>= deletedLegendEntriesSeq); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/piechart_deleted_legend_entry.docx b/chart2/qa/extras/data/docx/piechart_deleted_legend_entry.docx new file mode 100644 index 0000000000000000000000000000000000000000..da6b2fa19a634cf6c174ca6b0869971e1dc7ce02 GIT binary patch literal 27165 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 aDataPointSeq; + Sequence deletedLegendEntriesSeq; if( xSeriesProperties.is()) { xSeriesProperties->getPropertyValue("AttributedDataPoints") >>= aDataPointSeq; xSeriesProperties->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint; + + const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); + if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 ) + xSeriesProperties->getPropertyValue("DeletedLegendEntries") >>= deletedLegendEntriesSeq; } sal_Int32 nSize = aDataPointSeq.getLength(); @@ -3362,7 +3367,7 @@ void SchXMLExportHelper_Impl::exportDataPoints( // initialize so that it doesn't matter if // the element is counted in the first iteration aLastPoint.mnRepeat = 0; - + sal_Int32 nIndex = 0; for( const auto& rPoint : aDataPointVector ) { aPoint = rPoint; @@ -3379,6 +3384,15 @@ void SchXMLExportHelper_Impl::exportDataPoints( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED, OUString::number( ( aLastPoint.mnRepeat ) )); + for (auto& deletedLegendEntry : deletedLegendEntriesSeq) + { + if (nIndex == deletedLegendEntry) + { + mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_HIDE_LEGEND, OUString::boolean(true)); + break; + } + } + nIndex++; SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true ); exportCustomLabel(aLastPoint.mCustomLabelText); } @@ -3394,6 +3408,15 @@ void SchXMLExportHelper_Impl::exportDataPoints( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED, OUString::number( ( aLastPoint.mnRepeat ) )); + for (auto& deletedLegendEntry : deletedLegendEntriesSeq) + { + if (nIndex == deletedLegendEntry) + { + mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_HIDE_LEGEND, OUString::boolean(true)); + break; + } + } + SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true ); exportCustomLabel(aLastPoint.mCustomLabelText); } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 5ea889aa7621..dc32a9e900a0 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -679,6 +680,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr { OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; + bool bHideLegend = false; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) @@ -703,6 +705,23 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr sCustomLabelField = xAttrList->getValueByIndex( i ); mDataPoint.mCustomLabels.push_back(sCustomLabelField); } + else if (IsXMLToken(aLocalName, XML_HIDE_LEGEND)) + { + bHideLegend = xAttrList->getValueByIndex(i).toBoolean(); + if (bHideLegend) + { + uno::Sequence deletedLegendEntriesSeq; + Reference xSeriesProp(mDataPoint.m_xSeries, uno::UNO_QUERY); + xSeriesProp->getPropertyValue("DeletedLegendEntries") >>= deletedLegendEntriesSeq; + std::vector deletedLegendEntries; + for (auto& deletedLegendEntry : deletedLegendEntriesSeq) + { + deletedLegendEntries.push_back(deletedLegendEntry); + } + deletedLegendEntries.push_back(mDataPoint.m_nPointIndex); + xSeriesProp->setPropertyValue("DeletedLegendEntries", uno::makeAny(::oox::ContainerHelper::vectorToSequence(deletedLegendEntries))); + } + } } }