sw/CppunitTest_sw_odfimport.mk | 4 ++++ sw/qa/extras/odfimport/data/fdo37606.odt |binary sw/qa/extras/odfimport/data/fdo69862.odt |binary sw/qa/extras/odfimport/data/fdo81223.odt |binary sw/qa/extras/odfimport/data/i61225.sxw |binary sw/qa/extras/odfimport/data/ooo77837-1.odt |binary sw/qa/extras/odfimport/data/tdf101729.odt |binary sw/qa/extras/odfimport/data/tdf107392.odt |binary sw/qa/extras/odfimport/data/tdf115079.odt |binary sw/qa/extras/odfimport/data/tdf116195.odt |binary sw/qa/extras/odfimport/data/tdf146597.odt |binary 11 files changed, 4 insertions(+)
New commits: commit bb9faad7e9ee135b82daf57699d3118e7c0219ae Author: Miklos Vajna <[email protected]> AuthorDate: Thu Mar 14 08:05:15 2024 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Mar 14 09:13:23 2024 +0100 CppunitTest_sw_odfimport: turn on set_non_application_font_use Similar to commit dc4d7500c9d283e26d1553ce11366a217cf1f69d (Fix CppunitTest_sd_import_tests-smartart non_application_font_use, 2023-10-23), replaced fonts as suggested by the failing assert. Change-Id: Ia0225a15b295efd86b6dbfeb2c80e9c161cbe566 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164800 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index c1aeb0b9af7c..b9925c29c0f0 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -74,4 +74,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sw_odfimport,\ officecfg/registry \ )) +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_odfimport,abort)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sw/qa/extras/odfimport/data/fdo37606.odt b/sw/qa/extras/odfimport/data/fdo37606.odt index 462984f11303..5a088bfd0aff 100644 Binary files a/sw/qa/extras/odfimport/data/fdo37606.odt and b/sw/qa/extras/odfimport/data/fdo37606.odt differ diff --git a/sw/qa/extras/odfimport/data/fdo69862.odt b/sw/qa/extras/odfimport/data/fdo69862.odt index aec48fd13913..58e7332e9d55 100644 Binary files a/sw/qa/extras/odfimport/data/fdo69862.odt and b/sw/qa/extras/odfimport/data/fdo69862.odt differ diff --git a/sw/qa/extras/odfimport/data/fdo81223.odt b/sw/qa/extras/odfimport/data/fdo81223.odt index 21343d3dd91d..5e99c9531bb0 100644 Binary files a/sw/qa/extras/odfimport/data/fdo81223.odt and b/sw/qa/extras/odfimport/data/fdo81223.odt differ diff --git a/sw/qa/extras/odfimport/data/i61225.sxw b/sw/qa/extras/odfimport/data/i61225.sxw index 4f43541995c3..14e8009948ab 100644 Binary files a/sw/qa/extras/odfimport/data/i61225.sxw and b/sw/qa/extras/odfimport/data/i61225.sxw differ diff --git a/sw/qa/extras/odfimport/data/ooo77837-1.odt b/sw/qa/extras/odfimport/data/ooo77837-1.odt index 7be4f2b3e33b..47675dabadaa 100644 Binary files a/sw/qa/extras/odfimport/data/ooo77837-1.odt and b/sw/qa/extras/odfimport/data/ooo77837-1.odt differ diff --git a/sw/qa/extras/odfimport/data/tdf101729.odt b/sw/qa/extras/odfimport/data/tdf101729.odt index 3afd2d001afc..f322934637e7 100644 Binary files a/sw/qa/extras/odfimport/data/tdf101729.odt and b/sw/qa/extras/odfimport/data/tdf101729.odt differ diff --git a/sw/qa/extras/odfimport/data/tdf107392.odt b/sw/qa/extras/odfimport/data/tdf107392.odt index c8a05a9eef94..5c5a92d46ce0 100644 Binary files a/sw/qa/extras/odfimport/data/tdf107392.odt and b/sw/qa/extras/odfimport/data/tdf107392.odt differ diff --git a/sw/qa/extras/odfimport/data/tdf115079.odt b/sw/qa/extras/odfimport/data/tdf115079.odt index 6c1039e71ced..4a9431f27c4d 100644 Binary files a/sw/qa/extras/odfimport/data/tdf115079.odt and b/sw/qa/extras/odfimport/data/tdf115079.odt differ diff --git a/sw/qa/extras/odfimport/data/tdf116195.odt b/sw/qa/extras/odfimport/data/tdf116195.odt index 21a601f69d66..7f6aa5823378 100644 Binary files a/sw/qa/extras/odfimport/data/tdf116195.odt and b/sw/qa/extras/odfimport/data/tdf116195.odt differ diff --git a/sw/qa/extras/odfimport/data/tdf146597.odt b/sw/qa/extras/odfimport/data/tdf146597.odt index 6dcc379cef4d..b923712ceacb 100644 Binary files a/sw/qa/extras/odfimport/data/tdf146597.odt and b/sw/qa/extras/odfimport/data/tdf146597.odt differ
