[Libreoffice-commits] core.git: desktop/source desktop/unx framework/source include/vcl scp2/source solenv/gbuild vcl/headless vcl/inc vcl/source
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 20 21:54:57 UTC 2019
desktop/source/app/app.cxx | 2 +-
desktop/source/app/cmdlineargs.cxx | 8 ++++----
desktop/source/app/sofficemain.cxx | 2 +-
desktop/unx/source/splashx.c | 3 ++-
framework/source/fwe/helper/titlehelper.cxx | 4 +++-
include/vcl/opengl/OpenGLWrapper.hxx | 13 +++++++------
scp2/source/ooo/module_hidden_ooo.scp | 2 --
solenv/gbuild/gbuild.mk | 5 -----
vcl/headless/svpinst.cxx | 22 ++++++++++++----------
vcl/inc/svsys.h | 4 +++-
vcl/source/salmain/salmain.cxx | 3 ++-
11 files changed, 35 insertions(+), 33 deletions(-)
New commits:
commit 693ba5704b0a26319b3b780f8553eb3e99bad7a1
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 18 11:48:13 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Sep 20 23:53:28 2019 +0200
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 at collabora.com>
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>
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index a09605ecc18a..a50cc4b401af 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <framework/titlehelper.hxx>
#include <classes/fwkresid.hxx>
#include <strings.hrc>
@@ -600,7 +602,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
OUString sVersion = ::utl::Bootstrap::getBuildIdData("development");
sTitle.append(" [");
sTitle.append(sVersion);
-#ifndef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
if (OpenGLWrapper::isVCLOpenGLEnabled())
sTitle.append("-GL");
#endif
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx
index 9c61a11c2a48..c84286ea5244 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -12,6 +12,7 @@
#ifndef INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
#define INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
+#include <config_features.h>
#include <vcl/dllapi.h>
// All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
@@ -22,18 +23,18 @@ struct VCL_DLLPUBLIC OpenGLWrapper
/**
* Returns true if VCL has OpenGL rendering enabled
*/
-#ifdef LIBO_HEADLESS
- static bool isVCLOpenGLEnabled()
- {
- return false;
- }
-#else
+#if HAVE_FEATURE_UI
static bool isVCLOpenGLEnabled();
/**
* Returns the number of times OpenGL buffers have been swapped.
*/
static sal_Int64 getBufferSwapCounter();
+#else
+ static bool isVCLOpenGLEnabled()
+ {
+ return false;
+ }
#endif
};
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index cff32e16930d..904cea2420bd 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -75,7 +75,6 @@ End
#endif
#endif
-#ifndef LIBO_HEADLESS
Module gid_Module_Root_Files_Images
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
@@ -87,7 +86,6 @@ Module gid_Module_Root_Files_Images
Styles = (HIDDEN_ROOT);
Files = (auto_ooo_images_ALL);
End
-#endif
#ifndef WITHOUT_FONTS
Module gid_Module_Root_Fonts_OOo_Hidden
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0a93e83f6ce3..d41c40123bc2 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -245,11 +245,6 @@ gb_GLOBALDEFS += -DDEBUG \
endif
endif
-ifeq ($(DISABLE_GUI),TRUE)
-gb_GLOBALDEFS += -DLIBO_HEADLESS \
-
-endif
-
gb_GLOBALDEFS += \
$(call gb_Helper_define_if_set,\
DISABLE_DYNLOADING \
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 335f70e4bba7..2070f68e1663 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include <sal/config.h>
#include <mutex>
@@ -34,7 +35,7 @@
#include <vcl/virdev.hxx>
#include <vcl/inputtypes.hxx>
#include <vcl/lok.hxx>
-#ifndef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
# include <vcl/opengl/OpenGLContext.hxx>
#endif
@@ -562,32 +563,33 @@ std::shared_ptr<vcl::BackendCapabilities> SvpSalInstance::GetBackendCapabilities
//obviously doesn't actually do anything, it's just a nonfunctional stub
-#ifdef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
-class SvpOpenGLContext
+class SvpOpenGLContext : public OpenGLContext
{
+ GLWindow m_aGLWin;
+private:
+ virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+ virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
};
OpenGLContext* SvpSalInstance::CreateOpenGLContext()
{
- return nullptr;
+ return new SvpOpenGLContext;
}
#else
-class SvpOpenGLContext : public OpenGLContext
+class SvpOpenGLContext
{
- GLWindow m_aGLWin;
-private:
- virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
- virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
};
OpenGLContext* SvpSalInstance::CreateOpenGLContext()
{
- return new SvpOpenGLContext;
+ return nullptr;
}
+
#endif
SvpSalTimer::~SvpSalTimer()
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 8c283f221e11..d86985669e80 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_INC_SVSYS_H
#define INCLUDED_VCL_INC_SVSYS_H
+#include <config_features.h>
+
#ifdef _WIN32
#include "win/svsys.h"
#elif defined MACOSX
@@ -29,7 +31,7 @@
#elif defined ANDROID
#include "android/svsys.h"
#elif defined HAIKU
-#elif defined LIBO_HEADLESS
+#elif !HAVE_FEATURE_UI
#else
#include "unx/svsys.h"
#endif
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index 47c4760560cd..d0771d236824 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <config_features.h>
#include <sal/main.h>
#include <tools/extendapplicationenvironment.hxx>
@@ -26,7 +27,7 @@
#include <vcl/svmain.hxx>
SAL_IMPLEMENT_MAIN() {
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && HAVE_FEATURE_UI && !defined HAIKU
fire_glxtest_process();
#endif
tools::extendApplicationEnvironment();
More information about the Libreoffice-commits
mailing list