diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-21 11:29:42 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-21 12:46:28 +0200 |
| commit | e125c8fa82beca36791e1bdeae116824f4bc7a7b (patch) | |
| tree | 91d5013cd5e35ed5cf19ca8b94ed0d9e3873dba7 /vcl | |
| parent | 0a7058b48a5ce51f7be99f10fc0363859c41a7aa (diff) | |
Put HEADLESS definition under LIBO namespace
tml reminds us that use a generic and potentially clash-prone word
like HEADLESS as preprocessor defintion is pretty lame.
He suggests to put it under the already used LIBO namespace.
To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svsys.h | 2 | ||||
| -rw-r--r-- | vcl/null/printerinfomanager.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h index 0fbb9ce81a5a..d6d7c8b6c6c2 100644 --- a/vcl/inc/svsys.h +++ b/vcl/inc/svsys.h @@ -39,7 +39,7 @@ #include "ios/svsys.h" #elif defined ANDROID #include "android/svsys.h" -#elif defined HEADLESS +#elif defined LIBO_HEADLESS #else #include "unx/svsys.h" #endif diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index e5adda76e650..526a9362c05a 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -60,7 +60,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) : m_bUseIncludeFeature( false ), m_bUseJobPatch( true ), m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ), -#ifdef HEADLESS +#ifdef LIBO_HEADLESS m_bDisableCUPS( true ) #else m_bDisableCUPS( false ) diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 6b5279af975a..1ce60de385e6 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -53,7 +53,7 @@ static oslModule pCloseModule = NULL; static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false ) { SalInstance* pInst = NULL; -#if !defined(ANDROID) || !defined(HEADLESS) +#if !defined(ANDROID) || !defined(LIBO_HEADLESS) // Disable gtk3 plugin load except in experimental mode for now. if( !bForce && rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gtk3" ) ) && @@ -129,7 +129,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals return pInst; } -#if !defined(ANDROID) || !defined(HEADLESS) +#if !defined(ANDROID) || !defined(LIBO_HEADLESS) static DesktopType get_desktop_environment() { diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 0885836e06b2..ab428d3f4c2c 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile ) PrinterInfoManager& rMgr = PrinterInfoManager::get(); if( rMgr.getType() == PrinterInfoManager::CUPS ) { -#if !defined(ANDROID) && !defined(HEADLESS) +#if !defined(ANDROID) && !defined(LIBO_HEADLESS) pNewParser = const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile )); #endif } |