sw/CppunitTest_sw_macros_test.mk              |    4 ++++
 sw/CppunitTest_sw_mailmerge.mk                |    4 ++++
 sw/CppunitTest_sw_mailmerge2.mk               |    4 ++++
 sw/qa/core/data/docm/testModernVBA.docm       |binary
 sw/qa/core/data/docm/testModernVBADelete.docm |binary
 sw/qa/core/data/docm/testVBA.docm             |binary
 6 files changed, 12 insertions(+)

New commits:
commit dd077ed0df3e9ca95fc4ca8151164ffd941fe820
Author:     Noel Grandin <[email protected]>
AuthorDate: Tue Jan 6 12:27:52 2026 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Tue Jan 6 20:15:15 2026 +0100

    CppunitTest_sw_macros_test: gb_CppunitTest_set_non_application_font_use
    
    I unzipped the test files, replaced font names, and then re-zipped them
    
    Change-Id: I76d7151ca80dbb5df773bd77cbf06decde59a97f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196612
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <[email protected]>

diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 413d04a99cb2..d79414ad28c2 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -77,6 +77,10 @@ $(eval $(call 
gb_CppunitTest_use_rdb,sw_macros_test,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call 
gb_CppunitTest_set_non_application_font_use,sw_macros_test,abort))
+endif
+
 $(eval $(call gb_CppunitTest_add_arguments,sw_macros_test, \
     
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}"
 \
 ))
diff --git a/sw/qa/core/data/docm/testModernVBA.docm 
b/sw/qa/core/data/docm/testModernVBA.docm
index c08d738c8adb..5286d1709b4c 100644
Binary files a/sw/qa/core/data/docm/testModernVBA.docm and 
b/sw/qa/core/data/docm/testModernVBA.docm differ
diff --git a/sw/qa/core/data/docm/testModernVBADelete.docm 
b/sw/qa/core/data/docm/testModernVBADelete.docm
index e3a70719de3a..1f6163c63986 100644
Binary files a/sw/qa/core/data/docm/testModernVBADelete.docm and 
b/sw/qa/core/data/docm/testModernVBADelete.docm differ
diff --git a/sw/qa/core/data/docm/testVBA.docm 
b/sw/qa/core/data/docm/testVBA.docm
index 7b8495c0567d..939d0a1ef088 100644
Binary files a/sw/qa/core/data/docm/testVBA.docm and 
b/sw/qa/core/data/docm/testVBA.docm differ
commit 3a023f4de018cd27b6c376b39964dcbda6d80c5a
Author:     Noel Grandin <[email protected]>
AuthorDate: Tue Jan 6 12:01:33 2026 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Tue Jan 6 20:15:03 2026 +0100

    CppunitTest_sw_mailmerge*: gb_CppunitTest_set_non_application_font_use
    
    Change-Id: I3c8f224fe78d2a8963b61554b3fbe61379bceb40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196611
    Reviewed-by: Noel Grandin <[email protected]>
    Tested-by: Jenkins

diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 0fc83a21b629..1a4b5aaea36f 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -60,4 +60,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_mailmerge,\
        modules/swriter \
 ))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_mailmerge,abort))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_mailmerge2.mk b/sw/CppunitTest_sw_mailmerge2.mk
index f7a376b09eac..13f1122bbfdd 100644
--- a/sw/CppunitTest_sw_mailmerge2.mk
+++ b/sw/CppunitTest_sw_mailmerge2.mk
@@ -61,4 +61,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_mailmerge2,\
        modules/swriter \
 ))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_mailmerge2,abort))
+endif
+
 # vim: set noet sw=4 ts=4:

Reply via email to