diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-17 14:35:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-17 19:06:19 +0100 |
| commit | 70ae12fe0b9e33633fc62cf805c261ef51fb4b59 (patch) | |
| tree | 17335be3e99ddadca44db66f0048dbed679999fa /sw | |
| parent | 5339d0800ccdcd325294e61f8ae9e67648beb035 (diff) | |
DOCX import: don't touch the ZOrder of inline, in-shape objects
1) This is not needed: Word only supports inline "anchoring" in
textboxes.
2) If the textbox has a certain ZOrder, we don't want the inline shapes
to be behind the textbox.
3) This allows restoring the old assert in sw_ooxmlexport7 that was
changed in commit 99847d6b3005c5444ed5a46ca578c0e40149d77c (DOCX import:
fix ZOrder of inline vs anchored shapes, 2020-02-12).
Change-Id: I817e4fb70cb789e8eb116219050fc1aeaec76667
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88873
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index e057f4e1c856..344b493dae4b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -564,7 +564,7 @@ DECLARE_OOXMLEXPORT_TEST(test76317, "test76317.docx") DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(fdo76591, "fdo76591.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); - assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]", "relativeHeight", "4"); + assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]", "relativeHeight", "3"); } DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(test76317_2K10, "test76317_2K10.docx") |