[Libreoffice-commits] core.git: 3 commits - chart2/qa oox/source

[Markus Mohrhard]

 chart2/qa/extras/chart2export.cxx        |   11 +++++++++++
 chart2/qa/extras/data/xlsx/tdf90876.xlsx |binary
 oox/source/export/chartexport.cxx        |   11 +++++++++++
 3 files changed, 22 insertions(+)

New commits:
commit 4fb32d8ac28c5fb9e6a230818be0c05da9b53ad4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 3 07:13:33 2015 +0200

    add test for tdf#90876
    
    Change-Id: I5841f1b7b6f9ff60f9f1437b76a3e0b1b552a8a2

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index abc7f87..0dbc470 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -96,6 +96,7 @@ public:
     void testAxisCharacterPropertiesXLSX();
     void testTitleCharacterPropertiesXLSX();
     void testPlotVisOnlyXLSX();
+    void testBarChartVaryColorsXLSX();
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest);
     CPPUNIT_TEST(testErrorBarXLSX);
@@ -156,6 +157,7 @@ public:
     CPPUNIT_TEST(testAxisCharacterPropertiesXLSX);
     CPPUNIT_TEST(testTitleCharacterPropertiesXLSX);
     CPPUNIT_TEST(testPlotVisOnlyXLSX);
+    CPPUNIT_TEST(testBarChartVaryColorsXLSX);
     CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1434,6 +1436,15 @@ void Chart2ExportTest::testPlotVisOnlyXLSX()
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotVisOnly", "val", "0");
 }
 
+void Chart2ExportTest::testBarChartVaryColorsXLSX()
+{
+    load("/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
+    xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", "0");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/tdf90876.xlsx b/chart2/qa/extras/data/xlsx/tdf90876.xlsx
new file mode 100644
index 0000000..3cf60e8
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf90876.xlsx differ
commit 3e2f2e562c15e690b947e11a49f1443d71f87e9e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 3 06:58:28 2015 +0200

    don't assume varyColors for bubbleChart, related tdf#90876
    
    Change-Id: If31ce89380424b7248e49f3d4ab40e35106378c4

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 72b6f54..79792d9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1626,6 +1626,11 @@ void ChartExport::exportBubbleChart( Reference< chart2::XChartType > xChartType
     pFS->startElement( FSNS( XML_c, XML_bubbleChart ),
             FSEND );
 
+    const char* varyColors = "0";
+    pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+            XML_val, varyColors,
+            FSEND );
+
     sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
     exportSeries( xChartType, nAttachedAxis );
 
commit dcc6c0770d57a4b70813b72feb9b5bb2541cf4a7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 3 06:57:47 2015 +0200

    don't assume varyColors for barCharts, tdf#90876
    
    Change-Id: I754d667fa9f909916265bd9320f1bd56d2226ecd

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index bca8efe..72b6f54 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1549,6 +1549,12 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
             FSEND );
 
     exportGrouping( true );
+
+    const char* varyColors = "0";
+    pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+            XML_val, varyColors,
+            FSEND );
+
     sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
     exportSeries( xChartType, nAttachedAxis );