[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - vcl/headless vcl/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 3748c7a7c48fd625b00153c787e9d38a2e631efe
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Nov 20 20:53:50 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Nov 20 22:57:12 2018 +0100

    Fix headless build on Linux
    
    Conditional-compile some OpenGL-ness that crept in
    
    Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index c39ffaeb5205..9de3cb5733cb 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -27,7 +27,9 @@
 #include <sal/types.h>
 
 #include <vcl/inputtypes.hxx>
-#include <vcl/opengl/OpenGLContext.hxx>
+#ifndef LIBO_HEADLESS
+# include <vcl/opengl/OpenGLContext.hxx>
+#endif
 
 #include <headless/svpinst.hxx>
 #include <headless/svpframe.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 6d43a5b9f9a3..f46c2328d63e 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,7 +32,9 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/controllayout.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
+#ifdef MACOSX
+# include <vcl/opengl/OpenGLHelper.hxx>
+#endif
 
 #include <outdata.hxx>
 #include <outdev.h>