diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2018-01-15 16:43:07 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-23 23:28:04 +0100 |
| commit | ada232a67fbb3acf60b104a4916719dbdb891819 (patch) | |
| tree | 6506393d29be795a7bb5ba9bb3d97b87e63b3009 /sw | |
| parent | 4e00b175e2c222bc320ec16caa90aa1bd2c1b7a7 (diff) | |
tdf#113946 add 'topMargin' to GraphicHelpers import
The case '...topMargin' was not caught for setting a relative
vertical position in GraphicHelpers. The test file demands a '7' here,
which stands for 'PAGE_FRAME'. The '7' was overwritten in GraphicImport in case
'LN_CT_Anchor_positionV' by a call of 'resolve'.
For a better overview a switch is inserted here.
Change-Id: Ie98209fe445ecbba15c3dafe5980ca52421126f8
Reviewed-on: https://gerrit.libreoffice.org/47908
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf113946.docx | bin | 0 -> 15580 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf113946.docx b/sw/qa/extras/ooxmlimport/data/tdf113946.docx Binary files differnew file mode 100644 index 000000000000..060df76ecc2a --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf113946.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4d65beeb90c4..449dae04ac59 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1567,6 +1567,13 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); } + +DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") +{ + OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top"); + CPPUNIT_ASSERT_EQUAL( OUString("1696"), aTop ); +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); |