diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-12 11:42:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-12 15:47:59 +0100 |
| commit | 48b5b7641d0df960558082e8948da8598f801264 (patch) | |
| tree | a80f51c83cb8930d41fb99acf0e63667b74502c0 /sw | |
| parent | e5cb1989520baf321961dbb82437d1b00a2a499c (diff) | |
bnc#865381 DOCX import: fix btLr cell direction when having vertical merge
Change-Id: I527955671e1100f05da717bffe002131baaf0291
Diffstat (limited to 'sw')
| -rwxr-xr-x | sw/qa/extras/ooxmlimport/data/bnc865381.docx | bin | 0 -> 19510 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/bnc865381.docx b/sw/qa/extras/ooxmlimport/data/bnc865381.docx Binary files differnew file mode 100755 index 000000000000..bb125cc73095 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/bnc865381.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index bff4e1ee6f74..809e7639cfa9 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1100,6 +1100,16 @@ DECLARE_OOXMLIMPORT_TEST(testTbLrHeight, "tblr-height.docx") CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, getProperty<sal_Int16>(xTableRows->getByIndex(0), "SizeType")); } +DECLARE_OOXMLIMPORT_TEST(testBnc865381, "bnc865381.docx") +{ + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0), uno::UNO_QUERY); + uno::Reference<table::XTableRows> xTableRows(xTextTable->getRows(), uno::UNO_QUERY); + // Second row has a vertically merged cell, make sure size type is MIN in that case (otherwise B2 is not readable). + CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty<sal_Int16>(xTableRows->getByIndex(1), "SizeType")); +} + DECLARE_OOXMLIMPORT_TEST(testFdo53985, "fdo53985.docx") { // Unhandled excetion prevented import of the rest of the document. |