diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-03-11 19:51:58 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-15 11:00:44 +0100 |
| commit | cdceca118b65f69d8c16bf3f8465f940aed73c10 (patch) | |
| tree | f2fe3a3861ffb56c6348b20e8b7c49f16b1d308f /sw | |
| parent | 57f7841fca0b10e24a02fe624c3be18f62106121 (diff) | |
fdo#76016 Changed oox/CustomTarget_generated.mk
oox/source/export/presetShapeDefinitions.xml had
multiple entries for "upDownArrow" instead of an entry
for "upArrow".
Whereas drawingml/customshapes/presetShapeDefinitions.xml
has correct entries.
Changed CustomTarget_generated.mk to use
drawingml/customshapes/presetShapeDefinitions.xml instead of
oox/source/export/presetShapeDefinitions.xml. Also deleted the latter
to avoid duplication.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8540
Change-Id: Ic46496af7fb79edf0780b04731a882d914e89a24
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/fdo76016.docx | bin | 0 -> 15182 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76016.docx b/sw/qa/extras/ooxmlexport/data/fdo76016.docx Binary files differnew file mode 100644 index 000000000000..79fa6b9a4228 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/fdo76016.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 96c1995a920d..9a43735a7b61 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2781,6 +2781,16 @@ DECLARE_OOXMLEXPORT_TEST(testCitation,"FDO74775.docx") CPPUNIT_ASSERT(contents.match(" CITATION [Kra06]")); } +DECLARE_OOXMLEXPORT_TEST(testFdo76016, "fdo76016.docx") +{ + // check XML + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[1]", "name", "adj1"); + assertXPath(pXmlDoc, "//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[2]", "name", "adj2"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |