From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 9 Nov 2022 16:20:12 +0000 (+0000)
Subject: do-not-ABORT_ON_NON_APPLICATION_FONT_USE
X-Git-Tag: archive/raspbian/1%7.4.2-4+rpi1~1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5c52d03e48e3e26d910585355823a3226fd8f9f;p=libreoffice.git

do-not-ABORT_ON_NON_APPLICATION_FONT_USE


Gbp-Pq: Name do-not-ABORT_ON_NON_APPLICATION_FONT_USE.diff
---

diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 80dc1530fdb..2cae001add5 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -71,11 +71,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_layout, \
     svx \
 ))
 
-# assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_core_layout): \
-    EXTRA_ENV_VARS := \
-        SAL_ABORT_ON_NON_APPLICATION_FONT_USE=1
-
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_layout))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk
index 9d10fa9ac2c..cd0d86b7f98 100644
--- a/sw/layoutwriter_setup.mk
+++ b/sw/layoutwriter_setup.mk
@@ -82,11 +82,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter$(1), \
 $(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
     $(call gb_Library_get_target,textconv_dict)
 
-# assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
-    EXTRA_ENV_VARS := \
-        SAL_ABORT_ON_NON_APPLICATION_FONT_USE=1
-
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter$(1)))
 
 endef