From 2aa773c9bdb8fc89225d251ca2662a328a0d5e6f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 25 Jan 2024 08:18:59 +0100 Subject: [PATCH] CppunitTest_sw_uibase_frmdlg: 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/uibase/frmdlg/data/wrapped-math-object.docx: word/media/image1.wmf: old WMF used the System font, replaced this with a different WMF, as the preview gets updated before the first document render anyway. (Binary patching 'System' -> 'DejaVu Sans' is not easy.) Change-Id: I5282ec1708d3a52d1fd2795a283b5e96884409d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162551 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/CppunitTest_sw_uibase_frmdlg.mk | 4 ++++ .../frmdlg/data/wrapped-math-object.docx | Bin 20504 -> 23850 bytes 2 files changed, 4 insertions(+) diff --git a/sw/CppunitTest_sw_uibase_frmdlg.mk b/sw/CppunitTest_sw_uibase_frmdlg.mk index 0f831a46f906..abfa133f7a06 100644 --- a/sw/CppunitTest_sw_uibase_frmdlg.mk +++ b/sw/CppunitTest_sw_uibase_frmdlg.mk @@ -73,4 +73,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_uibase_frmdlg, \ $(eval $(call gb_CppunitTest_use_more_fonts,sw_uibase_frmdlg)) +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_uibase_frmdlg,abort)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sw/qa/uibase/frmdlg/data/wrapped-math-object.docx b/sw/qa/uibase/frmdlg/data/wrapped-math-object.docx index c6f76dd5d77e678e148ffde10dd9362e38fa019f..46e6106e7677b2c7f81b20c4d3a3652c241ebb1c 100644 GIT binary patch delta 6217 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 HUyc3`4Ck6_ delta 2590 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