diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-02 16:39:22 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-12-02 17:04:36 +0000 |
| commit | 1f8a70262ad99668210d9d6a128efd8382f63dd5 (patch) | |
| tree | d20f656fea162633ceb4621c0efb8261696ecdae /sw/qa/extras/ww8export | |
| parent | 6ecb196b784a6ef4e45da49ea14311ecdd465d56 (diff) | |
tdf#104333 revert ww8import: set table keep/split if emulated
tables that span multiple pages, and rows greater than one page
caused problems, so just removing the enhancement that tried
to emulate what the original odt looked like.
reverts commit 129f93e46c29b388d38e9097869fd3e72dc40a5e
from bug tdf#91083
Change-Id: Iac31116d731e1e4aa60ee6b8de973f7f9291e47a
Reviewed-on: https://gerrit.libreoffice.org/31551
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/qa/extras/ww8export')
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index a89798408c3c..f5fffee106f2 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -1251,39 +1251,9 @@ DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt") //emulate table "keep with next" -do not split table CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), parseDump("/root/page[3]/body/tab[1]/row[2]/cell[1]/txt[1]") ); CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), parseDump("/root/page[6]/body/tab[1]/row[2]/cell[1]/txt[1]") ); - - // detect and re-enable keep-with-next and dont-split-table settings - uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); - uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); - uno::Reference<text::XTextTable> xTable (xTables->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); } #endif -DECLARE_WW8EXPORT_TEST(testTdf91083_tableKeep, "tdf91083_tableKeep.doc") -{ - // detect and re-enable keep-with-next and dont-split-table settings - uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); - uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); - - // single-row table - kept with next - uno::Reference<text::XTextTable> xTable (xTables->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); - // I don't know how to test for SvxFormatKeepItem - - // complex table - kept with next - xTables->getByIndex(1) >>= xTable; - CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); - - //single row table - do not split - xTables->getByIndex(3) >>= xTable; - CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); - - //multi-row table - do not split - xTables->getByIndex(4) >>= xTable; - CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); -} - DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, "tdf76349_textboxMargins.doc") { // textboxes without borders were losing their spacing items in round-tripping |