summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx12
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx6
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx8
-rw-r--r--vcl/generic/print/genpspgraphics.cxx8
-rw-r--r--vcl/inc/generic/glyphcache.hxx4
-rw-r--r--vcl/inc/win/salgdi.h8
-rw-r--r--vcl/source/gdi/outdev3.cxx14
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx4
-rw-r--r--vcl/unx/kde/FPServiceInfo.hxx2
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx4
-rw-r--r--vcl/unx/kde/fpicker/kdecommandthread.cxx2
-rw-r--r--vcl/unx/kde/fpicker/kdecommandthread.hxx4
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.cxx8
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.hxx8
-rw-r--r--vcl/unx/kde/fpicker/kdefpmain.cxx6
-rw-r--r--vcl/unx/kde/fpicker/kdemodalityfilter.cxx2
-rw-r--r--vcl/unx/kde/fpicker/kdemodalityfilter.hxx4
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx2
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx12
-rw-r--r--vcl/win/source/gdi/winlayout.cxx12
22 files changed, 67 insertions, 67 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index aac80883830b..17e089ff6642 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -29,7 +29,7 @@
#include <outfont.hxx>
#include <impfont.hxx>
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <graphite2/Font.h>
#include <graphite_layout.hxx>
#endif
@@ -269,7 +269,7 @@ void FtFontFile::Unmap()
mpFileMap = NULL;
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// wrap FtFontInfo's table function
const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, size_t *len)
{
@@ -307,7 +307,7 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
mnFaceNum( nFaceNum ),
mnRefCount( 0 ),
mnSynthetic( nSynthetic ),
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
mbCheckedGraphite(false),
mpGraphiteFace(NULL),
#endif
@@ -336,7 +336,7 @@ FtFontInfo::~FtFontInfo()
delete mpExtraKernInfo;
delete mpChar2Glyph;
delete mpGlyph2Char;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
delete mpGraphiteFace;
#endif
}
@@ -367,7 +367,7 @@ FT_FaceRec_* FtFontInfo::GetFaceFT()
return maFaceFT;
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
{
if (mbCheckedGraphite)
@@ -2574,7 +2574,7 @@ const unsigned char* ServerFont::GetTable(const char* pName, sal_uLong* pLength)
return mpFontInfo->GetTable( pName, pLength );
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const
{
return mpFontInfo->GetGraphiteFace();
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 9d677e1cf252..dea75b3b2332 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -25,7 +25,7 @@
#include <rtl/textcvt.h>
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
class GraphiteFaceWrapper;
#endif
@@ -72,7 +72,7 @@ public:
const unsigned char* GetTable( const char*, sal_uLong* pLength=0 ) const;
FT_FaceRec_* GetFaceFT();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
GraphiteFaceWrapper* GetGraphiteFace();
#endif
void ReleaseFaceFT( FT_FaceRec_* );
@@ -101,7 +101,7 @@ private:
const int mnFaceNum;
int mnRefCount;
const int mnSynthetic;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
bool mbCheckedGraphite;
GraphiteFaceWrapper * mpGraphiteFace;
#endif
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index bc9fb09410a2..3ceb72442516 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -28,7 +28,7 @@
#include <outfont.hxx>
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <graphite_features.hxx>
#endif
@@ -85,7 +85,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
{
// TODO: is it worth to improve this hash function?
sal_IntPtr nFontId = reinterpret_cast<sal_IntPtr>( rFontSelData.mpFontData );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
!= -1)
{
@@ -99,7 +99,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
nHash += rFontSelData.mbVertical;
nHash += rFontSelData.GetSlant();
nHash += rFontSelData.GetWeight();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
nHash += rFontSelData.meLanguage;
#endif
return nHash;
@@ -134,7 +134,7 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
if( nAWidth != nBWidth )
return false;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if (rA.meLanguage != rB.meLanguage)
return false;
// check for features
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 523a0e9a8e3d..4149e41b48d6 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -47,7 +47,7 @@
#include "langboost.hxx"
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <graphite_layout.hxx>
#include <graphite_serverfont.hxx>
#endif
@@ -743,7 +743,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
if (bIsPspServerFontLayout)
{
const PspServerFontLayout * pPspLayout = dynamic_cast<const PspServerFontLayout*>(&rLayout);
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
const GraphiteServerFontLayout * pGrLayout = dynamic_cast<const GraphiteServerFontLayout*>(&rLayout);
#endif
if (pPspLayout)
@@ -752,7 +752,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
nMinCharPos = pPspLayout->getMinCharPos();
nMaxCharPos = pPspLayout->getMaxCharPos();
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
else if (pGrLayout)
{
}
@@ -1021,7 +1021,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
if( m_pServerFont[ nFallbackLevel ]
&& !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
{
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// Is this a Graphite font?
if (GraphiteServerFontLayout::IsGraphiteEnabledFont(*m_pServerFont[nFallbackLevel]))
{
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
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 9f022ed94215..df1016c7d883 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -64,7 +64,7 @@
#include "osl/file.h"
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include "graphite_features.hxx"
#endif
@@ -2077,7 +2077,7 @@ size_t FontSelectPatternAttributes::hashCode() const
// TODO: does it pay off to improve this hash function?
static FontNameHash aFontNameHash;
size_t nHash = aFontNameHash( maSearchName );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// check for features and generate a unique hash if necessary
if (maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
!= -1)
@@ -2175,7 +2175,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo
return false;
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// check for features
if ((rA.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
!= STRING_NOTFOUND ||
@@ -2373,7 +2373,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
rFSD.maTargetName = GetNextFontToken( rFSD.GetFamilyName(), nTokenPos );
aSearchName = rFSD.maTargetName;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// Until features are properly supported, they are appended to the
// font name, so we need to strip them off so the font is found.
sal_Int32 nFeat = aSearchName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX);
@@ -2418,7 +2418,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
}
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// restore the features to make the font selection data unique
rFSD.maTargetName = aOrigName;
#endif
@@ -2430,7 +2430,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
// some systems provide special customization
// e.g. they suggest "serif" as UI-font, but this name cannot be used directly
// because the system wants to map it to another font first, e.g. "Helvetica"
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// use the target name to search in the prematch hook
rFSD.maTargetName = aBaseFontName;
#endif
@@ -2455,7 +2455,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
if( mpPreMatchHook->FindFontSubstitute( rFSD ) )
GetEnglishSearchFontName( aSearchName );
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// the prematch hook uses the target name to search, but we now need
// to restore the features to make the font selection data unique
rFSD.maTargetName = aOrigName;
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]))
diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 5cddc5f2e829..49f30c1da9c4 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -22,7 +22,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
// the service names
#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.TDEFilePicker"
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 914768a3852b..afd4350f8719 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -73,7 +73,7 @@ namespace
uno::Sequence<rtl::OUString> aRet(3);
aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker");
#else // ENABLE_TDE
aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker");
@@ -703,7 +703,7 @@ void UnxFilePicker::initFilePicker()
#endif
// The executable name
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
rtl::OUString helperurl("${ORIGIN}/tdefilepicker");
#else // ENABLE_TDE
rtl::OUString helperurl("${ORIGIN}/kdefilepicker");
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index 064d06c610bd..55559d2117f1 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -23,7 +23,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqstringlist.h>
#include <tdeapplication.h>
#else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index acb90d8af248..b78592c3982e 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -22,11 +22,11 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqevent.h>
#include <tqmutex.h>
#include <tqthread.h>
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 5163079b4eb8..4dafb1ef0e4e 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -24,7 +24,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqcheckbox.h>
#include <tqcombobox.h>
@@ -78,7 +78,7 @@
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define QCheckBox_String "TQCheckBox"
#define QComboBox_String "TQComboBox"
#else // ENABLE_TDE
@@ -105,7 +105,7 @@ KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter,
m_bIsExecuting( false ),
m_bCanNotifySelection( true )
{
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
connect( this, SIGNAL( fileHighlighted( const TQString & ) ),
this, SLOT( fileHighlightedCommand( const TQString & ) ) );
#else // ENABLE_TDE
@@ -666,7 +666,7 @@ QString KDEFileDialog::localCopy( const QString &rFileName ) const
return qDestURL.url();
}
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
void KDEFileDialog::fileHighlightedCommand( const TQString & )
#else // ENABLE_TDE
void KDEFileDialog::fileHighlightedCommand( const QString & )
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index 046a1bc92645..e317a7d0e996 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -22,13 +22,13 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
#include <cstddef>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tdefiledialog.h>
#include <tdefilefiltercombo.h>
#else // ENABLE_TDE
@@ -42,7 +42,7 @@ class QVBox;
class KDEFileDialog : public KFileDialog
{
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
TQ_OBJECT
#else // ENABLE_TDE
Q_OBJECT
@@ -114,7 +114,7 @@ protected:
protected slots:
// Qt3 moc does not really understand #ifdef and would process both slots,
// so the FILTER_OUT_FOO tags are used to remove some slots before moc sees them.
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
void fileHighlightedCommand( const TQString & ); // FILTER_OUT_TDE
#else // ENABLE_TDE
void fileHighlightedCommand( const QString & ); // FILTER_OUT_KDE
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index df39e01e43ca..8178586b14e9 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -23,7 +23,7 @@
#include <kdefilepicker.hxx>
#include <kdecommandthread.hxx>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqeventloop.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
@@ -39,7 +39,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define THIS_DESKENV_NAME_CAP "TDE"
#define THIS_DESKENV_NAME_LOW "tde"
#else // ENABLE_TDE
@@ -47,7 +47,7 @@
#define THIS_DESKENV_NAME_LOW "kde"
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define KAboutData TDEAboutData
#define KCmdLineArgs TDECmdLineArgs
#define KCmdLineOptions TDECmdLineOptions
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 2c1f03475425..57e889a58460 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -21,7 +21,7 @@
#include <kdemodalityfilter.hxx>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tdeapplication.h>
#include <kdialogbase.h>
#else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index 05331fe8afb3..fadf77d24097 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@@ -22,11 +22,11 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqobject.h>
#else // ENABLE_TDE
#include <qobject.h>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 1724ac506385..5151350b72e2 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -46,7 +46,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define THIS_DESKENV_NAME_CAP "TDE"
#define THIS_DESKENV_NAME_LOW "tde"
#else // ENABLE_TDE
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 7b8b4eeba2d7..1f9971038019 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -34,7 +34,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define QPushButton_String "TQPushButton"
#define QRadioButton_String "TQRadioButton"
#define QCheckBox_String "TQCheckBox"
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 9a8cac9b2b04..f2bcd8e88f77 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -65,7 +65,7 @@
#include <algorithm>
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <graphite2/Font.h>
#endif
@@ -1046,7 +1046,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
}
// =======================================================================
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#ifdef DEBUG
static FILE * grLogFile = NULL;
@@ -1149,7 +1149,7 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS,
mbDisableGlyphApi( false ),
mbHasKoreanRange( false ),
mbHasCJKSupport( false ),
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
mpGraphiteData(NULL),
mbHasGraphiteSupport( false ),
#endif
@@ -1200,7 +1200,7 @@ ImplWinFontData::~ImplWinFontData()
if( mpUnicodeMap )
mpUnicodeMap->DeReference();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if (mpGraphiteData)
mpGraphiteData->DeReference();
#ifdef DEBUG
@@ -1232,7 +1232,7 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
ReadCmapTable( hDC );
GetFontCapabilities( hDC );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
static const char* pDisableGraphiteText = getenv( "SAL_DISABLE_GRAPHITE" );
if( !pDisableGraphiteText || (pDisableGraphiteText[0] == '0') )
{
@@ -1269,7 +1269,7 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
const gr_face* ImplWinFontData::GraphiteFace() const
{
#ifdef DEBUG
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 63f8a6559241..83bb2c3f5980 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -51,7 +51,7 @@ typedef boost::unordered_map<int,int> IntMap;
// Graphite headers
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <i18npool/languagetag.hxx>
#include <graphite_layout.hxx>
#include <graphite_features.hxx>
@@ -1191,7 +1191,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0};
aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
aScriptControl.fContextDigits = (0 != (rArgs.mnFlags & SAL_LAYOUT_SUBSTITUTE_DIGITS));
-#ifdef HAVE_FMERGENEUTRALITEMS
+#if HAVE_FMERGENEUTRALITEMS
aScriptControl.fMergeNeutralItems = true;
#endif
// determine relevant substring and work only on it
@@ -2671,7 +2671,7 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
return true;
}
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
class GraphiteLayoutWinImpl : public GraphiteLayout
{
@@ -2897,7 +2897,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
if( !(rArgs.mnFlags & SAL_LAYOUT_COMPLEX_DISABLED)
&& (bUspInited || InitUSP()) ) // CTL layout engine
{
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if (rFontFace.SupportsGraphite())
{
pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
@@ -2923,7 +2923,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
BYTE eCharSet = ANSI_CHARSET;
if( mpLogFont )
eCharSet = mpLogFont->lfCharSet;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if (rFontFace.SupportsGraphite())
pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
else
@@ -3038,7 +3038,7 @@ PhysicalFontFace* ImplWinFontData::Clone() const
{
if( mpUnicodeMap )
mpUnicodeMap->AddReference();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
if ( mpGraphiteData )
mpGraphiteData->AddReference();
#endif
generated by cgit (git 2.34.1) at 2024-07-14 00:38:29 +0000