From 002368eaaeaaf1e5b8e9ba151de1b22ef663e0bb Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 24 Apr 2015 16:33:48 +0200
Subject: [PATCH] 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 with
925907767cc63c1e5d6414e215f671a0b9f8a28a "disable sd's regression test again"
and subsequently removed with f5dbe0eaba923f5de84745a04f531b36c979cafa "Usage of
XShapeDumper in Impress added.")

Change-Id: I3bc8e26953bd4b5a59f8230ee93fe99e0488d5cc
---
 filter/source/svg/svgexport.cxx   | 7 ++-----
 sd/CppunitTest_sd_export_tests.mk | 2 +-
 sd/CppunitTest_sd_import_tests.mk | 4 ----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index d156efc7aa54..8cb737e0b768 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -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
     {
diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk
index e1fdbc4e03ce..6e4555f3a4c1 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -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)
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 73c2985b202a..b1d20cce2cae 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -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 \
 ))