dev/null |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 2 --
2 files changed, 2 deletions(-)
New commits:
commit ab639ae344704cd22318938cfeafbe954abcd2c0
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Apr 14 12:07:21 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Apr 14 13:23:42 2023 +0200
sw floattable: limit the unfloat button to legacy ODF files
CppunitTest_sw_uiwriter2's testUnfloatButton and testUnfloating failed
in the SW_FORCE_FLY_SPLIT=1 case, on unfloatable_floating_table.doc.
The trouble was that it assumed that floating tables from DOC are
imported as tables in non-split flys, which is no longer the case.
Fix the problem by limiting the test to legacy ODT files.
Change-Id: I0c82c04f3e44d9d0c936a5eb386cd2c0e68f8af1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150395
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/uiwriter/data/unfloatable_floating_table.doc
b/sw/qa/extras/uiwriter/data/unfloatable_floating_table.doc
deleted file mode 100644
index e5247f1598c2..000000000000
Binary files a/sw/qa/extras/uiwriter/data/unfloatable_floating_table.doc and
/dev/null differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index ccfe95910f5e..3f86b5b69f71 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2448,7 +2448,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloatButton)
// Different use cases where unfloat button should be visible
const std::vector<OUString> aTestFiles = {
"unfloatable_floating_table.odt", // Typical use case of multipage
floating table
- "unfloatable_floating_table.doc", // Also the DOC import
};
for (const OUString& aTestFile : aTestFiles)
@@ -2511,7 +2510,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloating)
// Test unfloating with tables imported from different file formats
const std::vector<OUString> aTestFiles = {
"unfloatable_floating_table.odt",
- "unfloatable_floating_table.doc",
};
for (const OUString& aTestFile : aTestFiles)
