diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-10 17:28:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-17 16:44:56 +0000 |
| commit | 2130deb2d13f7cbb5b5e55c061ad794e47e6999d (patch) | |
| tree | 8d612af075ed67d74a69aa1294159ed7de18c21d /vcl/unx | |
| parent | a818fa05c34bb2e969e2fe1972d9a52774538beb (diff) | |
Introduce headless switch for X / cairo / toolkit less build
The plan is to reduce dependencies to be easier to deploy
libreoffice server side in headless mode.
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 916dbe2f1d17..6b5279af975a 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; -#ifndef ANDROID +#if !defined(ANDROID) || !defined(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; } -#ifndef ANDROID +#if !defined(ANDROID) || !defined(HEADLESS) static DesktopType get_desktop_environment() { diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index fdb0f4ed3bd5..36a53b6aa65b 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 ) { -#ifndef ANDROID +#if !defined(ANDROID) && !defined(HEADLESS) pNewParser = const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile )); #endif } |