Kaydet (Commit) 989f0fa8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 0f6f2134
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl)) $(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl))
$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ $(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_FOLDER)/opengl,\
opengl_blacklist_windows.xml \ opengl_blacklist_windows.xml \
)) ))
......
...@@ -910,10 +910,10 @@ namespace { ...@@ -910,10 +910,10 @@ namespace {
OUString getBlacklistFile() 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); rtl::Bootstrap::expandMacros(url);
return url; return url + "/opengl/opengl_blacklist_windows.xml";
} }
......
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