diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-19 16:44:12 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-20 11:34:18 +0100 |
| commit | 52f8321c412cad280c9029f10f9aef03f4f20544 (patch) | |
| tree | 9942cfe490f7107177ad69175be3039b0f20b32a /vcl/unx/generic | |
| parent | 151abb8b2b9d3a22229b98cec12e29484d12109b (diff) | |
use #if instead of #ifdef for testing config_xxx.hxx macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html
Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index f4cba0ea199a..bacd1465b579 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -109,7 +109,7 @@ X11SalGraphics::X11SalGraphics() nTextPixel_ = 0; nTextColor_ = MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE // check if graphite fonts have been disabled static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" ); bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False; diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 391da493e039..96ce72da2bdf 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -67,7 +67,7 @@ #include "outdev.h" #include <config_graphite.h> -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE #include <graphite_layout.hxx> #include <graphite_serverfont.hxx> #endif @@ -744,7 +744,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe if( mpServerFont[ nFallbackLevel ] && !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) ) { -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE // Is this a Graphite font? if (!bDisableGraphite_ && GraphiteServerFontLayout::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel])) |