tdf#129452 writerfilter: preserve gridBefore longer than currentRow

It is a fairly common thing for table operations to need to
compare items in the same column (like merged cells for example).
In order to determine column information, each row's gridBefore
(and merged cells) need to be known.

So save that information in the row data - and don't just throw
it away after the current row has been analyzed.  Good grief.

Change-Id: Ie305477f0e3468a4a923095d76f520d97fe99ffe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97432
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>

1 files changed, 10 insertions, 1 deletions

diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 3140a00d71aa..d0e5be774959 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -116,13 +116,19 @@ 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
+
 public:
     typedef tools::SvRef<RowData> Pointer_t;
 
-    RowData() {}
+    RowData()
+        : m_nGridBefore(0)
+    {
+    }
 
     RowData(const RowData& rRowData)
     : SvRefBase(), mCells(rRowData.mCells), mpProperties(rRowData.mpProperties)
+        , m_nGridBefore(rRowData.m_nGridBefore)
     {
     }
 
@@ -227,6 +233,9 @@ public:
     {
         return mpProperties;
     }
+
+    sal_uInt32 getGridBefore() { return m_nGridBefore; }
+    void setGridBefore(sal_uInt32 nSkipGrids) { m_nGridBefore = nSkipGrids; }
 };
 
 /**