diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-08-02 14:39:27 +0200 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2021-08-04 06:04:04 +0200 |
| commit | d03aaef3dcb5d142955457ae9b8ca4469cfafa38 (patch) | |
| tree | 5bab68b1509ed83a6a2f07a25fad9c10708377c8 /sw/qa/extras/layout | |
| parent | fc0a31f30154c7c5aabb9f0367a10ee14c82821a (diff) | |
Revert "tdf#104254 sw DOCX import: fix text wrapping in headers"
This reverts commit 798b69087119c01a3b51e0bb3240ef35cfededeb.
The change affected not only DOCX compatibilityMode 15,
but also DOC and ODT and older versions of DOC
and everything else which should not have been affected.
This reverted change of course affected layout.
Some bug documents didn't loop after this layout breakage.
That doesn't mean that those bugs were fixed.
So just revert the tests:
Revert "tdf#96840: sw_ww8export3: Add unittest"
This reverts commit 975488594fc88aaba7298448e0ff727ebca7fe85.
Revert "tdf#64997: sw_ww8export3: Add unittest"
This reverts commit 02af9b8ef1f87bb6bc5fee22ad184681b20f201a.
Change-Id: I54f7b801199bba45d8ca6f82f77e7060c7b3fcf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119887
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras/layout')
| -rw-r--r-- | sw/qa/extras/layout/data/tdf104254.docx | bin | 30961 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 18 |
2 files changed, 0 insertions, 18 deletions
diff --git a/sw/qa/extras/layout/data/tdf104254.docx b/sw/qa/extras/layout/data/tdf104254.docx Binary files differdeleted file mode 100644 index a074db337024..000000000000 --- a/sw/qa/extras/layout/data/tdf104254.docx +++ /dev/null diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 5c8d8201df95..2eaea6a15c67 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3253,24 +3253,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770) assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1); } -CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTextWrappingInHeader) -{ - SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf104254.docx"); - - std::shared_ptr<GDIMetaFile> xMetaFile = pDoc->GetDocShell()->GetPreviewMetaFile(); - MetafileXmlDump dumper; - xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray", 2); - - // Make sure the header image does not block any of the header text. - // Without the accompanying fix in place, this test would have failed with: - // - Expected: > 3000 - // - Actual : 2009 - OUString sTextArrayX = getXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]", "x"); - CPPUNIT_ASSERT(sTextArrayX.toUInt32() > 3000); -} - CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testContinuousEndnotesInsertPageAtStart) { // Create a new document with CONTINUOUS_ENDNOTES enabled. |