diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-23 14:26:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-05-23 17:13:04 +0200 |
| commit | 383b82ef8e2c36415cf1039885bef4d44db412ac (patch) | |
| tree | 867dff632497d7e8379a51ec058b5678256a4379 /sw | |
| parent | f7a40e1470431d8978d4ca96e7651af9b0609df3 (diff) | |
tdf#91429 do not convert ooxml preset shape modifier values
Revert "Resolves: #i124703# adapt coordinate range from ms relative..."
This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467.
The reverted commit did not fix anything in LibreOffice in the
first place. The document referenced in #i124703# is as good
without the patch as with it. But it caused a regression.
Conflicts:
oox/source/drawingml/customshapeproperties.cxx
Change-Id: I65eb114423039e9c9c684cc55009275fd06caacd
Reviewed-on: https://gerrit.libreoffice.org/15875
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit da0a44b415f630ce39617b8c8f0c366177a7705e)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf91429.docx | bin | 0 -> 7989 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf91429.docx b/sw/qa/extras/ooxmlexport/data/tdf91429.docx Binary files differnew file mode 100644 index 000000000000..5fc5f533a8bf --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf91429.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 03afe283e368..ac7ba3c6bb3f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -990,6 +990,15 @@ DECLARE_OOXMLEXPORT_TEST(testExportShadow, "bnc637947.odt") assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:effectLst/a:outerShdw/a:srgbClr", "val" , "000000"); assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:effectLst/a:outerShdw/a:srgbClr/a:alpha", "val" , "38000"); } + +DECLARE_OOXMLEXPORT_TEST(testExportAdjustmentValue, "tdf91429.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + + assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd", "fmla", "val 50000"); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); |