From 989f0fa8dbe6af56aa33fc6b8c63364811f8635c Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Thu, 7 Jan 2016 12:53:03 +0200
Subject: The OpenGL Windows driver blacklist file should be in share, not user
 config

We don't want a potentially outdated copy to be used.

Besides, when it was in the user profile, it did not exist the first
time after an installation, or a user profile removal, when we
attempted to read it.

Change-Id: I21290090a3bbb44864730dff84c81e80add89fb3
---
 vcl/opengl/win/WinDeviceInfo.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vcl/opengl')

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 744319447de5..2f3ec80e16e4 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -910,10 +910,10 @@ namespace {
 
 OUString getBlacklistFile()
 {
-    OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/config/opengl_blacklist_windows.xml");
+    OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER);
     rtl::Bootstrap::expandMacros(url);
 
-    return url;
+    return url + "/opengl/opengl_blacklist_windows.xml";
 }
 
 
-- 
cgit