diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-21 07:32:14 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-12-23 04:20:26 +0000 |
| commit | 4cbe2e712bab42e95fb55d78da6b1daf326f7f1b (patch) | |
| tree | 4f0630309ff2a11e42831a10bed9bca7b63c847c /sw/qa | |
| parent | f804c7d0d36997db6bbbcb3b5619adf3f0064d1e (diff) | |
tdf#75573 - relocate code: alternate stream already started
moving this keeps the original fix and prevents losing a table
in this unit test
fixes regression commit ecea3431ca761369d8180a74eba2877533050516
Change-Id: I5e94760649020ddf1c468d52b91aaf0521bbfdda
Reviewed-on: https://gerrit.libreoffice.org/32269
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 34324bff1252dc5a51c9408f9502654453f319b6)
Reviewed-on: https://gerrit.libreoffice.org/32324
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf75573_lostTable.docx | bin | 0 -> 25590 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf75573_lostTable.docx b/sw/qa/extras/ooxmlimport/data/tdf75573_lostTable.docx Binary files differnew file mode 100644 index 000000000000..8ddb6619e0ad --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf75573_lostTable.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index eb45e2270a87..b1ccafc53c3f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -726,6 +726,19 @@ DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx") CPPUNIT_ASSERT(!bProt); } +DECLARE_OOXMLIMPORT_TEST(testTdf75573_lostTable, "tdf75573_lostTable.docx") +{ + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL_MESSAGE("# of tables", sal_Int32(1), xTables->getCount() ); + + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL_MESSAGE("# of frames/shapes", sal_Int32(0), xDraws->getCount() ); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("# of pages", 3, getPages() ); +} + DECLARE_OOXMLIMPORT_TEST(testMultiColumnSeparator, "multi-column-separator-with-line.docx") { uno::Reference<beans::XPropertySet> xTextSection = getProperty< uno::Reference<beans::XPropertySet> >(getParagraph(1, "First data."), "TextSection"); |