diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-09 19:29:54 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-20 09:19:09 +0100 |
| commit | 6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3 (patch) | |
| tree | 01380d838feb9158ef40302afc041cbaba5192e0 /vcl/source/opengl | |
| parent | d220e476df38e86e094066a690985c624316d37f (diff) | |
Drop some headless mode variants
This fixes OSX "make debugrun" by dropping VCL_HIDE_WINDOWS
handling and removing the internal GetPseudoHeadless() API.
While at it moves the DialogCancelMode enum out of Application.
Change-Id: I4876e752ddbfc39dd44faa673fb0e97810089a75
Reviewed-on: https://gerrit.libreoffice.org/61598
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/source/opengl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 6ae47184ae2e..aa876ac60688 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -972,8 +972,6 @@ bool OpenGLHelper::isVCLOpenGLEnabled() * There are a number of cases that these environment variables cover: * * SAL_FORCEGL forces OpenGL independent of any other option * * SAL_DISABLEGL or a blacklisted driver avoid the use of OpenGL if SAL_FORCEGL is not set - * * SAL_ENABLEGL overrides VCL_HIDE_WINDOWS and the configuration variable - * * the configuration variable is checked if no environment variable is set */ bSet = true; @@ -989,17 +987,16 @@ bool OpenGLHelper::isVCLOpenGLEnabled() else if (bSupportsVCLOpenGL) { static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL"); + static bool bHeadlessPlugin = (getenv("SAL_USE_VCLPLUGIN") && + 0 == strcmp(getenv("SAL_USE_VCLPLUGIN"), "svp")); bEnable = bEnableGLEnv; - static bool bDuringBuild = getenv("VCL_HIDE_WINDOWS"); - if (bDuringBuild && !bEnable /* env. enable overrides */) - bEnable = false; - else if (officecfg::Office::Common::VCL::UseOpenGL::get()) + if (officecfg::Office::Common::VCL::UseOpenGL::get()) bEnable = true; - // Force disable in safe mode - if (Application::IsSafeModeEnabled()) + // Force disable in safe mode or when running with headless plugin + if (bHeadlessPlugin || Application::IsSafeModeEnabled()) bEnable = false; bRet = bEnable; |