diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-01-29 12:40:01 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-12 02:40:06 +0100 |
| commit | a5f0344b410e2fbf1e80b18fa6d5094f44cc06bc (patch) | |
| tree | fecf43e544951226797c92d6ba70f9454397c652 /chart2 | |
| parent | f0d232f7b78edc3a0acff6d2beee97ff8bb2bd94 (diff) | |
fdo#74115 Fix for DOCX GradientFill for Chart Wall
Fixed import and export for chart wall Gradient Fill in DOCX
Added UT for the same.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: Ie6caa2b238aeb70f7225145da8c5c78003e73002
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 13 | ||||
| -rw-r--r-- | chart2/qa/extras/data/docx/fdo74115_WallGradientFill.docx | bin | 0 -> 17942 bytes |
2 files changed, 13 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 399c0bbf9f8b..d51bd1c96d62 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -43,6 +43,7 @@ public: void testUpDownBars(); void testDoughnutChart(); void testDisplayUnits(); + void testFdo74115WallGradientFill(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); @@ -58,6 +59,7 @@ public: CPPUNIT_TEST(testUpDownBars); CPPUNIT_TEST(testDoughnutChart); CPPUNIT_TEST(testDisplayUnits); + CPPUNIT_TEST(testFdo74115WallGradientFill); CPPUNIT_TEST_SUITE_END(); protected: @@ -162,6 +164,7 @@ xmlNodeSetPtr Chart2ExportTest::getXPathNode(xmlDocPtr pXmlDoc, const OString& r xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("w"), BAD_CAST("http://schemas.openxmlformats.org/wordprocessingml/2006/main")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("v"), BAD_CAST("urn:schemas-microsoft-com:vml")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("c"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/chart")); + xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("a"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/main")); xmlXPathObjectPtr pXmlXpathObj = xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx); return pXmlXpathObj->nodesetval; } @@ -540,9 +543,19 @@ void Chart2ExportTest::testDisplayUnits() load("/chart2/qa/extras/data/docx/", "DisplayUnits.docx"); xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit", "val", "billions"); } +void Chart2ExportTest::testFdo74115WallGradientFill() +{ + load("/chart2/qa/extras/data/docx/", "fdo74115_WallGradientFill.docx"); + xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/fdo74115_WallGradientFill.docx b/chart2/qa/extras/data/docx/fdo74115_WallGradientFill.docx Binary files differnew file mode 100644 index 000000000000..e10334bd9a90 --- /dev/null +++ b/chart2/qa/extras/data/docx/fdo74115_WallGradientFill.docx |