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 /vcl/headless | |
| 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 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpinst.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
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() |