diff options
-rw-r--r-- | vcl/Package_opengl_blacklist.mk | 2 | ||||
-rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk index b858a56eaa24..35dbfcb0b273 100644 --- a/vcl/Package_opengl_blacklist.mk +++ b/vcl/Package_opengl_blacklist.mk @@ -9,7 +9,7 @@ $(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 \ )) 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"; } |