[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - chart2/qa oox/source

[Tünde Tóth (via logerrit)]

 chart2/qa/extras/chart2export.cxx             |   11 +++++++++++
 chart2/qa/extras/data/xlsx/chart_pie2007.xlsx |binary
 oox/source/drawingml/chart/typegroupmodel.cxx |    2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit ebbb5f9626e95a1b56a588161a7383561f1a160a
Author:     Tünde Tóth <tundeth at gmail.com>
AuthorDate: Tue May 26 13:34:32 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Thu Jul 16 23:06:05 2020 +0200

    tdf#132594 Chart XLSX import: fix legend entries in pie charts
    
    Legend entry text of pie chart wasn't imported correctly
    in XLSX documents created with Excel 2007.
    
    Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8
    (tdf#128016 Chart OOXML Import: fix duplicated category labels)
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94864
    Tested-by: Jenkins
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95294
    (cherry picked from commit 59a896d80feee9f4c25b931c77aee281da189868)
    
    Change-Id: I4567437a41fe66e124dccbd148c0c49196d5c007
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98848
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index f1666188a00c..035b35456eba 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -154,6 +154,7 @@ public:
     void testTdf131979();
     void testTdf126076();
     void testTdf132076();
+    void testTdf132594();
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest);
     CPPUNIT_TEST(testErrorBarXLSX);
@@ -271,6 +272,7 @@ public:
     CPPUNIT_TEST(testTdf131979);
     CPPUNIT_TEST(testTdf126076);
     CPPUNIT_TEST(testTdf132076);
+    CPPUNIT_TEST(testTdf132594);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -2501,6 +2503,15 @@ void Chart2ExportTest::testTdf132076()
     }
 }
 
+void Chart2ExportTest::testTdf132594()
+{
+    load("/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
+    xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat", 1);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx
new file mode 100644
index 000000000000..b122680257c0
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx differ
diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx
index aae01ed0f58e..7353bafbecc7 100644
--- a/oox/source/drawingml/chart/typegroupmodel.cxx
+++ b/oox/source/drawingml/chart/typegroupmodel.cxx
@@ -57,7 +57,7 @@ TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId, bool bMSO2007Doc ) :
     mbSmooth( !bMSO2007Doc ),
     mbVaryColors( !bMSO2007Doc ),
     mbWireframe( !bMSO2007Doc ),
-    mbCatAxisVisible( !bMSO2007Doc )
+    mbCatAxisVisible( true )
 {
 }