Kaydet (Commit) 1947012a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SAL_USE_VCLPLUGIN is a UNO bootstrap variable

...(which includes environment variables), so read it as one (as is already done
in e.g. CreateSalInstance in vcl/source/app/salplug.cxx), esp. so since
lo_initialize in desktop/source/lib/init.cxx doesn't set it as an environment
variable

Change-Id: I557ecf4fcc5daba1e748af789847c8bbb9f563d6
Reviewed-on: https://gerrit.libreoffice.org/63801Reviewed-by: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 340ed84c
...@@ -987,8 +987,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled() ...@@ -987,8 +987,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
else if (bSupportsVCLOpenGL) else if (bSupportsVCLOpenGL)
{ {
static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL"); static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
static bool bHeadlessPlugin = (getenv("SAL_USE_VCLPLUGIN") && static bool bHeadlessPlugin = []{
0 == strcmp(getenv("SAL_USE_VCLPLUGIN"), "svp")); OUString plugin;
rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", plugin);
return plugin == "svp";
}();
bEnable = bEnableGLEnv; bEnable = bEnableGLEnv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment