diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-02-03 11:53:02 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-12 02:46:32 +0100 |
| commit | ffb1053b287fddd2c96757e5c6825381afc43fa1 (patch) | |
| tree | ab5104f314cd8a83feaceb525e0cb1b8ed952cd7 /chart2 | |
| parent | f38a223d6d455b07a4fdbfe842b2b367306544d5 (diff) | |
fdo#74115 Fix for DOCX BitmapFill for Chart Wall
Fixed import and export for chart wall Bitmap Fill in DOCX
Added UT for the same.
Conflicts:
oox/source/export/chartexport.cxx
Change-Id: Id066b0e4c2007fcdfdbbfa67b40307463bf0cfe7
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 10 | ||||
| -rw-r--r-- | chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx | bin | 0 -> 802053 bytes |
2 files changed, 10 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index d51bd1c96d62..7714084095c3 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -44,6 +44,7 @@ public: void testDoughnutChart(); void testDisplayUnits(); void testFdo74115WallGradientFill(); + void testFdo74115WallBitmapFill(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); @@ -60,6 +61,7 @@ public: CPPUNIT_TEST(testDoughnutChart); CPPUNIT_TEST(testDisplayUnits); CPPUNIT_TEST(testFdo74115WallGradientFill); + CPPUNIT_TEST(testFdo74115WallBitmapFill); CPPUNIT_TEST_SUITE_END(); protected: @@ -556,6 +558,14 @@ void Chart2ExportTest::testFdo74115WallGradientFill() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"); } +void Chart2ExportTest::testFdo74115WallBitmapFill() +{ + load("/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.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:blipFill"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx Binary files differnew file mode 100644 index 000000000000..0c842fd0787b --- /dev/null +++ b/chart2/qa/extras/data/docx/fdo74115_WallBitmapFill.docx |