diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-01-24 23:19:22 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-24 23:20:01 +0100 |
| commit | efc28fae8d9453ff313f363d28e5a94ccd3adc4a (patch) | |
| tree | 6559cf3e1db4e816ccebb873a9b58b7e006b9e35 /filter | |
| parent | e5e0aae1e220cdde7b06c899425dcabd912048d1 (diff) | |
Disable svg font embedding for sd filters test, enable again.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 1d636117c782..24aa950666a1 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -27,8 +27,6 @@ ************************************************************************/ -#define ITEMID_FIELD 0 - #include "svgwriter.hxx" #include "svgfontexport.hxx" #include "svgfilter.hxx" @@ -37,6 +35,7 @@ #include <com/sun/star/util/MeasureUnit.hpp> +#include <rtl/bootstrap.hxx> #include <svtools/miscopt.hxx> #include <svx/unopage.hxx> #include <svx/unoshape.hxx> @@ -488,9 +487,14 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) // font embedding const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); + rtl::OUString aEmbedFontEnv( + RTL_CONSTASCII_USTRINGPARAM("${SVG_DISABLE_FONT_EMBEDDING}")); + rtl::Bootstrap::expandMacros(aEmbedFontEnv); + const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : ( + aEmbedFontEnv.getLength() ? false : true); maFilterData[ 1 ].Name = B2UCONST( SVG_PROP_EMBEDFONTS ); - maFilterData[ 1 ].Value <<= (sal_Bool) ( pSVGDisableFontEmbedding ? sal_False : sal_True ); + maFilterData[ 1 ].Value <<= (sal_Bool) (bEmbedFonts); // Native decoration maFilterData[ 2 ].Name = B2UCONST( SVG_PROP_NATIVEDECORATION ); |