diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-07-07 10:36:12 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2020-07-15 21:11:33 +0200 |
| commit | 19ffc31ac047e9e8986591937ad945bc7dc2b875 (patch) | |
| tree | fc333fc246ac512a1b842c21d3d5786996bd43fb /sw | |
| parent | f013b5127e3048914d829cf918df2a43f133d108 (diff) | |
tdf129452 writerfilter: only affect vertical Merge_restart
If multiple merged cells are stacked on top of each other,
then don't follow the whole stack down to the bottom as
if it is one cell. In other words, merged-vertically is
not true or false, but start or continuing.
This stand-alone patch covers a corner case missed
by this bug's earlier LO 6.4 commit.
Change-Id: Ibaec6d609ff5b8a993be8dce0741fa2ca905da26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98242
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx | bin | 12728 -> 11237 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx b/sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx Binary files differindex 0e8ddd6d3833..399c06be1a30 100644 --- a/sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx +++ b/sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index c32928cccdf2..99c908351898 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -1059,6 +1059,9 @@ DECLARE_OOXMLEXPORT_TEST(testBottomBorders, "tdf129452_BottomBorders.docx") assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[4]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom [@w:val = 'nil']", 0); assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[4]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom [@w:val = 'nil']", 0); + + // But also don't treat separately merged cells as one - the topmost merged cell shouldn't gain a border. + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[4]/w:tcPr/w:tcBorders/w:bottom", 0); } DECLARE_OOXMLEXPORT_TEST(testFontTypes, "tdf120344_FontTypes.docx") |