diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-07-13 11:50:58 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-21 09:16:50 +0200 |
| commit | c3ca7e85ea27cb19475086e64b14e780c93910ca (patch) | |
| tree | f3b1fe1c4172237d5a80012f658cab6931c308d0 /sw | |
| parent | 5a083be34456e91427d0f2e2fea172f49f4502db (diff) | |
tdf#134709 writerfilter: consider gridAfter for table borders
When the table itself defines borders, those borders should
apply to the last cell in each row - even if some grids
are skipped with gridAfter. (i.e. it won't be a straight line
on the right side).
This commit depends on an earlier commit doing this for gridBefore.
Prior to this, gridAfter was never actually sent to DomainMapper,
so it was always at its initialized value of zero, and it was
only handled in the ooxml handlers.
So the bulk of this patch is setting up the foundational
parts of gridAfter - duplicating what was recently changed
in LO 7.1 for gridBefore.
Change-Id: Ieaf965fecf618eeaf41c7e8403b536c396138804
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98692
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index f5f4b1657007..70addfd3c60b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -135,7 +135,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf134609_gridAfter, "tdf134609_gridAfter.docx") // Table borders (width 159) apply to edge cells, even in uneven cases caused by gridBefore/gridAfter, table::BorderLine2 aBorder = getProperty<table::BorderLine2>(xTable->getCellByName("A1"), "RightBorder"); - //CPPUNIT_ASSERT_MESSAGE("Right border before gridAfter cells", aBorder.LineWidth > 0); + CPPUNIT_ASSERT_MESSAGE("Right border before gridAfter cells", aBorder.LineWidth > 0); aBorder = getProperty<table::BorderLine2>(xTable->getCellByName("E2"), "LeftBorder"); CPPUNIT_ASSERT_MESSAGE("Left edge border after gridBefore cells", aBorder.LineWidth > 100); aBorder = getProperty<table::BorderLine2>(xTable->getCellByName("E2"), "TopBorder"); |