diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-03 14:07:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-07 17:25:51 +0200 |
| commit | 344a596acc29163a9f49e1e6080041a3a9644eee (patch) | |
| tree | a33e8b9cab63f8d754386ef0a9cd1afe84323550 | |
| parent | d3b7252769edb502e33d6b487764ac9d0a9f487d (diff) | |
bnc#882383: Add chart unit test for GradientName property.
It needs to be set, so that the chart has colors. It was grey before.
The bug was fixed already in aacfd5038d05a02f8b1eade3a5896d3d7e959f3d,
which got pushed sooner, so this commit only changes
the property name from 'INVALID' to 'FillTransparenceGradientName'.
Change-Id: If06899258a4307d583480538338480ba5bb830b9
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 15 | ||||
| -rw-r--r-- | chart2/qa/extras/data/pptx/bnc882383.pptx | bin | 0 -> 43962 bytes | |||
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index d83e8c270de6..e0728edae9cc 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -43,6 +43,7 @@ public: void testPPTChartSeries(); void testODPChartSeries(); void testBnc864396(); + void testBnc882383(); void testSimpleStrictXLSX(); void testDelayedCellImport(); // chart range referencing content on later sheets void testFlatODSStackedColumnChart(); @@ -71,6 +72,7 @@ public: CPPUNIT_TEST(testPPTXHiddenDataSeries); CPPUNIT_TEST(testODPChartSeries); CPPUNIT_TEST(testBnc864396); + CPPUNIT_TEST(testBnc882383); CPPUNIT_TEST(testSimpleStrictXLSX); CPPUNIT_TEST(testDelayedCellImport); CPPUNIT_TEST(testFlatODSStackedColumnChart); @@ -388,6 +390,19 @@ void Chart2ImportTest::testBnc864396() } } +void Chart2ImportTest::testBnc882383() +{ + load("/chart2/qa/extras/data/pptx/", "bnc882383.pptx"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW); + uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); + CPPUNIT_ASSERT(xDataSeries.is()); + + uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW); + OUString sGradientName; + xPropertySet->getPropertyValue("GradientName") >>= sGradientName; + CPPUNIT_ASSERT(!sGradientName.isEmpty()); +} + void Chart2ImportTest::testSimpleStrictXLSX() { load("/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx"); diff --git a/chart2/qa/extras/data/pptx/bnc882383.pptx b/chart2/qa/extras/data/pptx/bnc882383.pptx Binary files differnew file mode 100644 index 000000000000..18b44f0c1b2c --- /dev/null +++ b/chart2/qa/extras/data/pptx/bnc882383.pptx diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index dd54c7d60d58..1fe5c758eddd 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -494,7 +494,7 @@ static const sal_Int32 spnFilledPropIds[] = PROP_FillStyle, PROP_Color, PROP_Transparency, - PROP_INVALID, + PROP_FillTransparenceGradientName, PROP_GradientName, PROP_FillBitmapName, PROP_FillBitmapMode, |