diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-11 12:34:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-11 13:08:56 +0000 |
| commit | 6128c10f550924c2b75f18b6c6220cc1770adba4 (patch) | |
| tree | 5a31791913e4e69ce2db60065b12eaa6ca934fc7 /sw | |
| parent | 2b4d7be9484d360d8361dd71d767afbcc67fdcb2 (diff) | |
Resolves: tdf#95321 tables in headers/footers with wrong content
Change-Id: I937ed893dfd9919bf48b8fd38a1b83c524200532
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ww8import/data/tdf95321.doc | bin | 0 -> 27648 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8import/ww8import.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sw/qa/extras/ww8import/data/tdf95321.doc b/sw/qa/extras/ww8import/data/tdf95321.doc Binary files differnew file mode 100644 index 000000000000..8b85472b5660 --- /dev/null +++ b/sw/qa/extras/ww8import/data/tdf95321.doc diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 600ca41577b3..7e9307b8f09b 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/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); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 124cd5074533..00c39fa9f2eb 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3540,7 +3540,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 |