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>

1 files changed, 5 insertions, 0 deletions

diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index a88c6a477430..a7b68dfd8130 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -121,18 +121,21 @@ class RowData final : public virtual SvRefBase
     mutable TablePropertyMapPtr mpProperties;
 
     sal_uInt32 m_nGridBefore; ///< number of grid columns in the parent table's table grid which must be skipped before the contents of this table row are added to the parent table
+    sal_uInt32 m_nGridAfter; ///< number of grid columns in the parent table's table grid which shall be left after the last cell in the table row
 
 public:
     typedef tools::SvRef<RowData> Pointer_t;
 
     RowData()
         : m_nGridBefore(0)
+        , m_nGridAfter(0)
     {
     }
 
     RowData(const RowData& rRowData)
     : SvRefBase(), mCells(rRowData.mCells), mpProperties(rRowData.mpProperties)
         , m_nGridBefore(rRowData.m_nGridBefore)
+        , m_nGridAfter(rRowData.m_nGridAfter)
     {
     }
 
@@ -240,6 +243,8 @@ public:
 
     sal_uInt32 getGridBefore() { return m_nGridBefore; }
     void setGridBefore(sal_uInt32 nSkipGrids) { m_nGridBefore = nSkipGrids; }
+    sal_uInt32 getGridAfter() { return m_nGridAfter; }
+    void setGridAfter(sal_uInt32 nSkipGrids) { m_nGridAfter = nSkipGrids; }
     sal_uInt32 getGridSpan(sal_uInt32 i) { return mCells[i]->getGridSpan(); }
     std::vector< sal_uInt32 > getGridSpans()
     {