From 1947012abc29cc3a6a58bdfcb3bd248e2c95c23d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 22 Nov 2018 12:51:45 +0100 Subject: 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/63801 Reviewed-by: Jan-Marek Glogowski Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/source/opengl/OpenGLHelper.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'vcl/source/opengl') diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index aa876ac60688..b2a70ed7064b 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -987,8 +987,11 @@ 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")); + static bool bHeadlessPlugin = []{ + OUString plugin; + rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", plugin); + return plugin == "svp"; + }(); bEnable = bEnableGLEnv; -- cgit v1.2.3