diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 16:33:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 16:33:48 +0200 |
| commit | 002368eaaeaaf1e5b8e9ba151de1b22ef663e0bb (patch) | |
| tree | 0c78c27874300e60cb63029789e947b6ce0beb77 /filter/source | |
| parent | acfebe601313a913640c75a2e0dcd10abaf526ea (diff) | |
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
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 7 |
1 files changed, 2 insertions, 5 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 { |