chart2: always use the series for the keys (symbols) in data table

In special case the legend keys are not series, but can be each
value of a series. This can't be done for the data table where so
this has been disabled.

This caused a crash when positioning the symbols, as in some cases
we got 0 symbols (due to another bug that didn't put the symbols
into the collection) or more symbols that there were series (and
the symbols couldn't be positioned correctly). With this change
we now get the correct number of symbols for the data table.

Also added the test document and test to open the document, to
make sure we don't crash anymore.

Change-Id: Idbebdd5295595a823b5420958e803b13258df035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138697
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

4 files changed, 38 insertions, 82 deletions

diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx
index eb983f7687f1..81e274400c67 100644
--- a/chart2/qa/extras/chart2import2.cxx
+++ b/chart2/qa/extras/chart2import2.cxx
@@ -61,6 +61,7 @@ public:
     void testTdf139658();
     void testTdf146066();
     void testTdf150434();
+    void testChartDataTableWithMultipleLegendEntriesForOneDataSeries();
 
     CPPUNIT_TEST_SUITE(Chart2ImportTest2);
 
@@ -103,6 +104,7 @@ public:
     CPPUNIT_TEST(testTdf139658);
     CPPUNIT_TEST(testTdf146066);
     CPPUNIT_TEST(testTdf150434);
+    CPPUNIT_TEST(testChartDataTableWithMultipleLegendEntriesForOneDataSeries);
 
     CPPUNIT_TEST_SUITE_END();
 };
@@ -948,6 +950,20 @@ void Chart2ImportTest2::testTdf150434()
     CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int32>(0), aPosition.Y);
 }
 
+void Chart2ImportTest2::testChartDataTableWithMultipleLegendEntriesForOneDataSeries()
+{
+    load(u"/chart2/qa/extras/data/xlsx/", u"DataTable-MultipleLegendEntriesForOneDataSeries.xlsx");
+    // Loading this file caused a crash in the data table code
+
+    Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
+                                               UNO_QUERY_THROW);
+    Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
+    Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
+    Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW);
+    Reference<drawing::XShape> xDataTableShape = getShapeByName(xShapes, "CID/D=0:DataTable=");
+    CPPUNIT_ASSERT(xDataTableShape.is());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx b/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx
new file mode 100644
index 000000000000..b077fd2e0315
--- /dev/null
+++ b/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index e34606cd1dc9..65d404fb0be8 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2516,11 +2516,6 @@ std::vector<ViewLegendSymbol> VSeriesPlotter::createSymbols(const awt::Size& rEn
                     if (!pSeries)
                         continue;
 
-                    if (!pSeries->getPropertiesOfSeries()->getPropertyValue("ShowLegendEntry").get<sal_Bool>())
-                    {
-                        continue;
-                    }
-
                     std::vector<ViewLegendSymbol> aSeriesSymbols = createSymbolsForSeries(rEntryKeyAspectRatio, *pSeries, xTarget, xContext);
 
                     //add series entries to the result now
@@ -2887,75 +2882,16 @@ std::vector<ViewLegendSymbol> VSeriesPlotter::createSymbolsForSeries(
     try
     {
         ViewLegendSymbol aEntry;
-        bool bVaryColorsByPoint = rSeries.isVaryColorsByPoint();
-        bool bIsPie = m_xChartTypeModel->getChartType().equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE);
-        try
-        {
-            if (bIsPie)
-            {
-                bool bDonut = false;
-                if ((m_xChartTypeModel->getPropertyValue("UseRings") >>= bDonut) && bDonut)
-                    bIsPie = false;
-            }
-        }
-        catch (const uno::Exception&)
-        {
-        }
-
-        if (bVaryColorsByPoint || bIsPie)
-        {
-            Sequence< OUString > aCategoryNames;
-            if (m_pExplicitCategoriesProvider)
-                aCategoryNames = m_pExplicitCategoriesProvider->getSimpleCategories();
-            Sequence<sal_Int32> deletedLegendEntries;
-            try
-            {
-                rSeries.getPropertiesOfSeries()->getPropertyValue("DeletedLegendEntries") >>= deletedLegendEntries;
-            }
-            catch (const uno::Exception&)
-            {
-            }
+        // symbol
+        rtl::Reference<SvxShapeGroup> xSymbolGroup(ShapeFactory::createGroup2D(xTarget));
 
-            for (sal_Int32 nIdx=0; nIdx < aCategoryNames.getLength(); ++nIdx)
-            {
-                bool deletedLegendEntry = false;
-                for (const auto& deletedLegendEntryIdx : std::as_const(deletedLegendEntries))
-                {
-                    if (nIdx == deletedLegendEntryIdx)
-                    {
-                        deletedLegendEntry = true;
-                        break;
-                    }
-                }
-                if (deletedLegendEntry)
-                    continue;
-
-                // symbol
-                rtl::Reference<SvxShapeGroup> xSymbolGroup(ShapeFactory::createGroup2D(xTarget));
-
-                // create the symbol
-                rtl::Reference<SvxShapeGroup> xShape = createLegendSymbolForPoint(rEntryKeyAspectRatio, rSeries, nIdx, xSymbolGroup);
+        // create the symbol
+        rtl::Reference<SvxShapeGroup> xShape = createLegendSymbolForSeries(rEntryKeyAspectRatio, rSeries, xSymbolGroup );
 
-                // set CID to symbol for selection
-                if (xShape.is())
-                {
-                    aEntry.xSymbol = xSymbolGroup;
-                }
-            }
-        }
-        else
+        // set CID to symbol for selection
+        if (xShape.is())
         {
-            // symbol
-            rtl::Reference<SvxShapeGroup> xSymbolGroup(ShapeFactory::createGroup2D(xTarget));
-
-            // create the symbol
-            rtl::Reference<SvxShapeGroup> xShape = createLegendSymbolForSeries(rEntryKeyAspectRatio, rSeries, xSymbolGroup );
-
-            // set CID to symbol for selection
-            if (xShape.is())
-            {
-                aEntry.xSymbol = xSymbolGroup;
-            }
+            aEntry.xSymbol = xSymbolGroup;
             aResult.push_back(aEntry);
         }
     }
diff --git a/chart2/source/view/main/DataTableView.cxx b/chart2/source/view/main/DataTableView.cxx
index 5504e08a4950..45b199b59d69 100644
--- a/chart2/source/view/main/DataTableView.cxx
+++ b/chart2/source/view/main/DataTableView.cxx
@@ -475,19 +475,23 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV
         sal_Int32 nTotalHeight = 0;
         for (sal_Int32 i = 0; i < xTableRows->getCount(); i++)
         {
-            xPropertySet.set(xTableRows->getByIndex(i), uno::UNO_QUERY);
-            sal_Int32 nHeight = 0;
-            xPropertySet->getPropertyValue("Height") >>= nHeight;
-            if (i > 0)
+            sal_Int32 nSymbolIndex = i - 1;
+            if (nSymbolIndex < sal_Int32(aSymbols.size()))
             {
-                auto& rSymbol = aSymbols[i - 1].xSymbol;
-                sal_Int32 nSymbolHeight = rSymbol->getSize().Height;
-                sal_Int32 nSymbolY
-                    = basegfx::fround(double(nHeight) / 2.0 - double(nSymbolHeight) / 2.0);
-                rSymbol->setPosition(
-                    { nTableX + constSymbolMargin, nTableY + nTotalHeight + nSymbolY });
+                xPropertySet.set(xTableRows->getByIndex(i), uno::UNO_QUERY);
+                sal_Int32 nHeight = 0;
+                xPropertySet->getPropertyValue("Height") >>= nHeight;
+                if (i > 0)
+                {
+                    auto& rSymbol = aSymbols[nSymbolIndex].xSymbol;
+                    sal_Int32 nSymbolHeight = rSymbol->getSize().Height;
+                    sal_Int32 nSymbolY
+                        = basegfx::fround(double(nHeight) / 2.0 - double(nSymbolHeight) / 2.0);
+                    rSymbol->setPosition(
+                        { nTableX + constSymbolMargin, nTableY + nTotalHeight + nSymbolY });
+                }
+                nTotalHeight += nHeight;
             }
-            nTotalHeight += nHeight;
         }
     }
     xBroadcaster->unlockBroadcasts();