diff options
| author | Justin Luth <justin.luth@collabora.com> | 2023-10-05 07:24:56 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-10-05 16:26:13 +0200 |
| commit | 32102e559eed6eadf2ea146e212a330a3bc897ca (patch) | |
| tree | 7f70dcaecbedcaff266a1e095a7832c3694387d4 /sw | |
| parent | d7e70203e0246830ed30b1b765c1fc3fab716b9b (diff) | |
This reverts 7.6 commit 828fde37632a5bb0542b6925454690a5287d6490.
and also reverts the dependent parts of the follow-up test from
commit 828fde37632a5bb0542b6925454690a5287d6490
(although the patch itself is fine to remain in place)
and also reverts followup "cid#1522030 Uninitialized scalar field"
commit 9a123a6e63600ba3998d22bbc300ac4b65b3da2c.
The commit in general is fine. However, it fails in case
of an empty paragraph (with only anchors).
Unfortunately, there is no way of knowing ahead of time,
so either everything needs to be processed after a delay,
or else the paragraph needs to be split and then re-joined
in case it is not an empty paragraph.
Both options are extremely non-trivial - I don't know how
to do either of them.
Change-Id: I9e98d825ad0008e822172b6797116ad16e90b871
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157593
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx | bin | 7037 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 15 |
2 files changed, 0 insertions, 15 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx b/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx Binary files differdeleted file mode 100644 index a282deaa0ad7..000000000000 --- a/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 066eb3647cb5..bbcc40dde073 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -193,11 +193,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf146984_anchorInShape, "tdf146984_anchorInShape.d { // This was only one page b/c the page break was missing. CPPUNIT_ASSERT_EQUAL(2, getPages()); - - const auto& pLayout = parseLayoutDump(); - // There are shapes on both pages - these should be non-zero numbers - assertXPath(pLayout, "//page[1]//anchored", 3); - assertXPath(pLayout, "//page[2]//anchored", 2); } DECLARE_OOXMLEXPORT_TEST(testTdf127622_framePr, "tdf127622_framePr.docx") @@ -379,16 +374,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153613_textboxAfterPgBreak2, "tdf153613_textboxA assertXPathContent(pLayout, "//page[2]/body/txt", "There should be no prior carriage return."); } -DECLARE_OOXMLEXPORT_TEST(testTdf153613_textboxAfterPgBreak3, "tdf153613_textboxAfterPgBreak3.docx") -{ - // All anchored TO-character shapes stay on the first page, before the page break. - CPPUNIT_ASSERT_EQUAL(2, getPages()); - CPPUNIT_ASSERT_EQUAL(3, getParagraphs()); - - const auto& pLayout = parseLayoutDump(); - assertXPath(pLayout, "//page[2]//anchored", 0); -} - DECLARE_OOXMLEXPORT_TEST(testTdf153613_sdtAfterPgBreak, "tdf153613_sdtAfterPgBreak.docx") { CPPUNIT_ASSERT_EQUAL(2, getPages()); |