Simplify SVG_DISABLE_FONT_EMBEDDING check
Environment variables are used as a source for bootstrap variables anyway. Consistently consider SVG_DISABLE_FONT_EMBEDDING to be enabled if the bootstrap variable is present, regardless of its value. No need to tset it in CppunitTest_sd_import_tests, as it only affects SvgExport. (However, there is currently no test of svg export in CppunitTests_sd_export_tests, either; it was last disabled with925907767c
"disable sd's regression test again" and subsequently removed withf5dbe0eaba
"Usage of XShapeDumper in Impress added.") Change-Id: I3bc8e26953bd4b5a59f8230ee93fe99e0488d5cc
This commit is contained in:
@@ -338,11 +338,8 @@ SVGExport::SVGExport(
|
||||
comphelper::SequenceAsHashMap::const_iterator iter = aFilterDataHashMap.find(SVG_PROP_EMBEDFONTS);
|
||||
if(iter==aFilterDataHashMap.end())
|
||||
{
|
||||
const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" );
|
||||
OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}");
|
||||
rtl::Bootstrap::expandMacros(aEmbedFontEnv);
|
||||
mbIsEmbedFonts = pSVGDisableFontEmbedding == nullptr
|
||||
&& aEmbedFontEnv.isEmpty();
|
||||
OUString v;
|
||||
mbIsEmbedFonts = !rtl::Bootstrap::get("SVG_DISABLE_FONT_EMBEDDING", v);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -74,7 +74,7 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sd_export_tests,\
|
||||
$(eval $(call gb_CppunitTest_use_configuration,sd_export_tests))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\
|
||||
"-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
|
||||
-env:SVG_DISABLE_FONT_EMBEDDING= \
|
||||
))
|
||||
|
||||
$(call gb_CppunitTest_get_target,sd_export_test) : $(call gb_AllLangResTarget_get_target,sd)
|
||||
|
@@ -110,10 +110,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_configuration,sd_import_tests))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_arguments,sd_import_tests,\
|
||||
"-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
|
||||
oox_customshapes \
|
||||
))
|
||||
|
Reference in New Issue
Block a user