sw/qa/extras/ww8export/ww8export.cxx | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 6fd625b1e9059c2f39e2efcd900aa87d810b1b4b
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Apr 18 10:17:36 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Apr 20 08:29:23 2023 +0200
sw floattable: fix CppunitTest_sw_ww8export's testTdf112346
Assert the layout, not the doc model, then this still passes.
(cherry picked from commit 2424fa9c601003a9778bbc3a9cf0f55d33ead6f1)
Change-Id: I5172fbc97547310f26cdf364191f404d875b3ff8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150594
Tested-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index d1213f8230cf..3afb2b6cd2fd 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -761,10 +761,17 @@ DECLARE_WW8EXPORT_TEST( testTdf105570, "tdf105570.doc" )
CPPUNIT_ASSERT_EQUAL( sal_uInt16(0),
pTableNd->GetTable().GetRowsToRepeat() );
}
-DECLARE_WW8EXPORT_TEST(testTdf112346, "tdf112346.doc")
+CPPUNIT_TEST_FIXTURE(Test, testTdf112346)
{
- // This was 1, multi-page table was imported as a floating one.
- CPPUNIT_ASSERT_EQUAL(0, getShapes());
+ SwModelTestBase::FlySplitGuard aGuard;
+ auto verify = [this]() {
+ // Multi-page table was imported as a single page.
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+ };
+ createSwDoc("tdf112346.doc");
+ verify();
+ reload(mpFilter, "tdf112346.doc");
+ verify();
}
DECLARE_WW8EXPORT_TEST(testTdf79639, "tdf79639.doc")
