sw/qa/extras/htmlexport/htmlexport.cxx | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit f3294eb1789e9603b5129f0f2d61116fd4853b52
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Aug 23 20:09:51 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Aug 24 08:23:53 2022 +0200
CppunitTest_sw_htmlexport: remove not needed mustTestImportOf()
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
(CppunitTest_sw_rtfimport: convert one testcase to use
CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation.
Change-Id: Iaf7b77a18bcfca86ab06928580fd5d924f7af493
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138742
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index e3f2afb6de97..957517e03c95 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -226,11 +226,6 @@ private:
return filename != std::string_view("fdo62336.docx");
}
- bool mustTestImportOf(const char* filename) const override
- {
- return filename != std::string_view("fdo62336.docx");
- }
-
virtual std::unique_ptr<Resetter> preTest(const char* filename) override
{
if (getTestName().indexOf("SkipImages") != -1)
@@ -364,10 +359,11 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276,
"fdo81276.html")
CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
"BottomMargin")) < 10);
}
-DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo62336, "fdo62336.docx")
+CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFdo62336)
{
// The problem was essentially a crash during table export as docx/rtf/html
- // If either of no-calc-layout or no-test-import is enabled, the crash
does not occur
+ // If calc-layout is enabled, the crash does not occur
+ loadAndReload("fdo62336.docx");
}
DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo86857, "fdo86857.html")
