diff --git a/sw/CppunitTest_sw_txtimport.mk b/sw/CppunitTest_sw_txtimport.mk index 1f1cc01a4109..1c9fc7114cef 100644 --- a/sw/CppunitTest_sw_txtimport.mk +++ b/sw/CppunitTest_sw_txtimport.mk @@ -62,7 +62,12 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_txtimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_txtimport)) ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtimport,abort)) +# Note: This test intentionally sets non-application font use to 'deny', +# rather than 'abort'. This temporarily works around an issue causing +# these tests to fail on fontconfig systems with CJK fonts installed. +# +# See tdf#161533 +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtimport,deny)) endif # vim: set noet sw=4 ts=4: diff --git a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt index be232521eafc..0825a97c41eb 100644 Binary files a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt and b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt differ diff --git a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt index b74e964113de..89f5e143181a 100644 Binary files a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt and b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt differ diff --git a/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt b/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt index eed02bb9ff59..a2f631e2665a 100644 --- a/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt +++ b/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt @@ -1,2 +1,2 @@ -フー -バー +AB +CD diff --git a/sw/qa/extras/txtexport/data/UTF8CRLF.txt b/sw/qa/extras/txtexport/data/UTF8CRLF.txt index 62d4d44677b6..6b39a70a1235 100644 --- a/sw/qa/extras/txtexport/data/UTF8CRLF.txt +++ b/sw/qa/extras/txtexport/data/UTF8CRLF.txt @@ -1,2 +1,2 @@ -フー -バー +AB +CD diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx index a628fc56ed64..8a958a4579f8 100644 --- a/sw/qa/extras/txtexport/txtexport.cxx +++ b/sw/qa/extras/txtexport/txtexport.cxx @@ -85,7 +85,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf8bom) save(mpFilter); std::vector aMemStream = readMemoryStream(); OString aData(std::string_view(aMemStream.data(), aMemStream.size())); - CPPUNIT_ASSERT_EQUAL(u8"\uFEFFフー\r\nバー\r\n"_ostr, aData); + CPPUNIT_ASSERT_EQUAL(u8"\uFEFFAB\r\nCD\r\n"_ostr, aData); } CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf16lebom) @@ -94,7 +94,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf16lebom) save(mpFilter); std::vector aMemStream = readMemoryStream(); OUString aData(aMemStream.data(), aMemStream.size()); - CPPUNIT_ASSERT_EQUAL(u"\uFEFFフー\r\nバー\r\n"_ustr, aData); + CPPUNIT_ASSERT_EQUAL(u"\uFEFFAB\r\nCD\r\n"_ustr, aData); } CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf8) @@ -103,7 +103,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf8) save(mpFilter); std::vector aMemStream = readMemoryStream(); OString aData(std::string_view(aMemStream.data(), aMemStream.size())); - CPPUNIT_ASSERT_EQUAL(u8"フー\r\nバー\r\n"_ostr, aData); + CPPUNIT_ASSERT_EQUAL(u8"AB\r\nCD\r\n"_ostr, aData); } CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf16le) @@ -112,7 +112,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf16le) save(mpFilter); std::vector aMemStream = readMemoryStream(); OUString aData(aMemStream.data(), aMemStream.size()); - CPPUNIT_ASSERT_EQUAL(u"フー\r\nバー\r\n"_ustr, aData); + CPPUNIT_ASSERT_EQUAL(u"AB\r\nCD\r\n"_ustr, aData); } CPPUNIT_TEST_FIXTURE(TxtExportTest, testClearingBreakExport)