strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

abort more writer layout tests if a font isn't found

Browse source 
Change-Id: I4d94b60531505f2d5a493b4c51f4c9110d3a4517
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133633
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-04-29 10:40:34 +01:00
parent 172270a8f0
commit bd1f61dff6
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sw/CppunitTest_sw_core_layout.mk
View file

@ -71,6 +71,11 @@ $(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:

2
sw/layoutwriter_setup.mk
View file

@ -82,7 +82,7 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter$(1), \
$(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
$(call gb_Library_get_target,textconv_dict)
# reset the LD_LIBRARY_PATH for spawned GPG processes
# 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

4
vcl/unx/generic/fontmanager/fontconfig.cxx
View file

@ -1175,8 +1175,6 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
static bool bAbortOnFontSubstitute = getenv("SAL_ABORT_ON_NON_APPLICATION_FONT_USE") != nullptr;
if (bAbortOnFontSubstitute && rPattern.maTargetName != rPattern.maSearchName)
{
SAL_INFO("vcl.fonts", "PrintFontManager::Substitute: missing font: '" << rPattern.maTargetName <<
"' try: " << rPattern.maSearchName << " instead");
if (bMissingJustBullet)
{
assert(rPattern.maTargetName == "Amiri Quran" || rPattern.maTargetName == "David CLM" ||
@ -1187,6 +1185,8 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
// ImplFontMetricData::ImplInitTextLineSize
return;
}
SAL_WARN("vcl.fonts", "PrintFontManager::Substitute: missing font: '" << rPattern.maTargetName <<
"' try: " << rPattern.maSearchName << " instead");
std::abort();
}
}