From b49c6551fcdeb2ff9c965fcbe885344f5f108e59 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 20 Jun 2024 16:46:52 +0200 Subject: [PATCH] CppunitTest_sw_writerfilter_ooxml: turn on set_non_application_font_use Similar to commit dc4d7500c9d283e26d1553ce11366a217cf1f69d (Fix CppunitTest_sd_import_tests-smartart non_application_font_use, 2023-10-23): - sw/qa/writerfilter/ooxml/data/recursive_header_rels.docx: Aptos -> Calibri Change-Id: I6bcf3f39861426f2e94d0d88e301007501636e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169283 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/CppunitTest_sw_writerfilter_ooxml.mk | 4 ++++ .../ooxml/data/recursive_header_rels.docx | Bin 16911 -> 16918 bytes 2 files changed, 4 insertions(+) diff --git a/sw/CppunitTest_sw_writerfilter_ooxml.mk b/sw/CppunitTest_sw_writerfilter_ooxml.mk index d7faae578f4f..cfae3bc41a9f 100644 --- a/sw/CppunitTest_sw_writerfilter_ooxml.mk +++ b/sw/CppunitTest_sw_writerfilter_ooxml.mk @@ -51,4 +51,8 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_writerfilter_ooxml)) # by a link relation $(call gb_CppunitTest_get_target,sw_writerfilter_ooxml) : $(call gb_Library_get_target,sw_writerfilter) +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_writerfilter_ooxml,abort)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sw/qa/writerfilter/ooxml/data/recursive_header_rels.docx b/sw/qa/writerfilter/ooxml/data/recursive_header_rels.docx index 8000760017ed01fc26dce0963e87fc6fe30741e6..4d1d128d93127782b757327b5fec532cb51a8fd9 100644 GIT binary patch delta 2511 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 F{{U>yyk!6Y delta 2460 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