diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:12:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:12:16 +0000 |
| commit | ffb909f8a95280b7bb231af750d51fcd88fa5aa0 (patch) | |
| tree | e995287793ebac98323bff5efea5f1ce1ace6d6d /vcl/unx/source | |
| parent | 502c1d8ca465e8c424e3d720c1e9435b1e177e27 (diff) | |
INTEGRATION: CWS vcl93 (1.155.24); FILE MERGED
2008/08/11 13:54:10 hdu 1.155.24.1: make empty env-vars work as expected
Diffstat (limited to 'vcl/unx/source')
| -rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index f052dbb3984d..5caaaa81c425 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi3.cxx,v $ - * $Revision: 1.157 $ + * $Revision: 1.158 $ * * This file is part of OpenOffice.org. * @@ -788,7 +788,7 @@ CairoWrapper::CairoWrapper() : mpCairoLib( NULL ) { static const char* pDisableCairoText = getenv( "SAL_DISABLE_CAIROTEXT" ); - if( pDisableCairoText && (pDisableCairoText[0] == '1') ) + if( pDisableCairoText && (pDisableCairoText[0] != '0') ) return; int nDummy; @@ -1549,7 +1549,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList ) { // allow disabling of native X11 fonts static const char* pEnableX11FontStr = getenv( "SAL_ENABLE_NATIVE_XFONTS" ); - if( pEnableX11FontStr && (pEnableX11FontStr[0] == '1') ) + if( !pEnableX11FontStr || (pEnableX11FontStr[0] != '0') ) { // announce X11 fonts XlfdStorage* pX11FontList = GetDisplay()->GetXlfdList(); |