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/inc | |
| parent | use -isystem instead of -I for 3rd party headers (diff) | |
| download | core-52f8321c412cad280c9029f10f9aef03f4f20544.tar.gz core-52f8321c412cad280c9029f10f9aef03f4f20544.zip | |
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/inc')
| -rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/win/salgdi.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 9de49e7543fd..033b6463e984 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -49,7 +49,7 @@ class ServerFontLayout; #include <sallayout.hxx> #include <config_graphite.h> -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE class GraphiteFaceWrapper; #endif @@ -206,7 +206,7 @@ public: GlyphData& GetGlyphData( int nGlyphIndex ); const GlyphMetric& GetGlyphMetric( int nGlyphIndex ) { return GetGlyphData( nGlyphIndex ).GetMetric(); } -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE virtual GraphiteFaceWrapper* GetGraphiteFace() const; #endif diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index a60b6f6d9c92..dca9497efd3a 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -30,7 +30,7 @@ #include <boost/unordered_set.hpp> #include <config_graphite.h> -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE #include <graphite2/Font.h> #endif @@ -41,7 +41,7 @@ class ImplFontAttrCache; #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE class RawFontData; class GrFontData { @@ -86,7 +86,7 @@ public: bool SupportsArabic() const { return mbHasArabicSupport; } bool AliasSymbolsHigh() const { return mbAliasSymbolsHigh; } bool AliasSymbolsLow() const { return mbAliasSymbolsLow; } -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE bool SupportsGraphite() const { return mbHasGraphiteSupport; } const gr_face* GraphiteFace() const; #endif @@ -107,7 +107,7 @@ private: mutable bool mbDisableGlyphApi; mutable bool mbHasKoreanRange; mutable bool mbHasCJKSupport; -#ifdef ENABLE_GRAPHITE +#if ENABLE_GRAPHITE mutable GrFontData* mpGraphiteData; mutable bool mbHasGraphiteSupport; #endif |