Resolves: tdf#95321 tables in headers/footers with wrong content

Change-Id: I937ed893dfd9919bf48b8fd38a1b83c524200532
(cherry picked from commit 6128c10f)
Reviewed-on: https://gerrit.libreoffice.org/19911Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 82c0f2eb)

sw/qa/extras/ww8import/ww8import.cxx

@@ -419,6 +419,16 @@ DECLARE_WW8IMPORT_TEST(testBnc863018, "bnc863018.doc")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getProperty<sal_Int32>(xTable, "TopMargin"));
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf95321, "tdf95321.doc")
+{
+    // The problem was that there should be content in the second cell
+    // but there wasn't.
+    uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+    uno::Reference<text::XTextTable> xTable(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Second Column"), uno::Reference<text::XTextRange>(xTable->getCellByName("B1"), uno::UNO_QUERY)->getString());
+}
+
 DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc")
 {
     uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);

sw/source/filter/ww8/ww8par.cxx

@@ -3544,7 +3544,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
                 //
                 //So the 0x7 should be right at the end of the previous
                 //range to be a real cell-end.
-                if (pPap->nOrigStartPos == nCpOfs+nPosCp+1 ||
+                if (pPap->nOrigStartPos == nPosCp+1 ||
                     pPap->nOrigStartPos == WW8_CP_MAX)
                 {
                     TabCellEnd();       // Table cell/row end