diff options
| author | Andras Timar <andras.timar@collabora.com> | 2019-09-18 11:48:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-09-20 23:53:28 +0200 |
| commit | 693ba5704b0a26319b3b780f8553eb3e99bad7a1 (patch) | |
| tree | 65a2ef3e659aa993098dfb92cd7fbe7833c57020 /desktop | |
| parent | de4dfa06c9b353e3c34dfea14b38325a87f6ec8a (diff) | |
Replace remaining occurrences of LIBO_HEADLESS with HAVE_FEATURE_UI
Change-Id: Ie2b04ee443dece851d3d96afbc932aa64369c75c
Reviewed-on: https://gerrit.libreoffice.org/79084
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 2 | ||||
| -rw-r--r-- | desktop/unx/source/splashx.c | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b733080fd94a..c38958c05dd9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1578,7 +1578,7 @@ int Desktop::Main() // In headless mode, reap the process started by fire_glxtest_process() early in soffice_main // (desktop/source/app/sofficemain.cxx), in a code block that needs to be covered by the same // #if condition as this code block: -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL if (rCmdLineArgs.IsHeadless()) { reap_glxtest_process(); } diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 30d0c3f4cced..381147cd534e 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -695,12 +695,12 @@ void CommandLineArgs::InitParamValues() { m_minimized = false; m_norestore = false; -#ifdef LIBO_HEADLESS - m_invisible = true; - m_headless = true; -#else +#if HAVE_FEATURE_UI m_invisible = false; m_headless = false; +#else + m_invisible = true; + m_headless = true; #endif m_eventtesting = false; m_quickstart = false; diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 917361ebf0d3..719446e03a81 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -129,7 +129,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() #endif #endif -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL /* Run test for OpenGL support in own process to avoid crash with broken * OpenGL drivers. Start process as early as possible. * In non-headless mode, the process will be reaped in X11OpenGLDeviceInfo::GetData diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 9136876aa9df..d759ed3a4816 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -7,9 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_features.h> #include "splashx.h" -#if defined(ENABLE_QUICKSTART_LIBPNG) && !defined(LIBO_HEADLESS) +#if defined(ENABLE_QUICKSTART_LIBPNG) && HAVE_FEATURE_UI #include <X11/Xlib.h> #include <X11/Xatom.h> |