From 998057c36b6df4a12818824d770121f779725f72 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 29 Oct 2019 17:20:37 +0100 Subject: fix vcldemo lookup of icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Icon themes are in [srcdir]/icon-themes, which is not necessarily the same as $PWD/icon-themes. Change-Id: Id2c5037afcbea4ea7dd511a9e10e19e05fa52a5a Reviewed-on: https://gerrit.libreoffice.org/81701 Tested-by: Jenkins Reviewed-by: Noel Grandin Reviewed-by: Luboš Luňák --- vcl/source/image/ImplImageTree.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'vcl/source/image') diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 21901a9b940e..df561e87a842 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -464,14 +464,10 @@ void ImplImageTree::createStyle() if (isVclDemo()) { - static OUString s_workingDir; - if (!s_workingDir.getLength()) - osl_getProcessWorkingDir( &s_workingDir.pData ); - if (maCurrentStyle == "default") - sThemeUrl = s_workingDir + "/icon-themes/colibre-svg"; + sThemeUrl = "file://" SRC_ROOT "/icon-themes/colibre-svg"; else - sThemeUrl = s_workingDir + "/icon-themes/" + maCurrentStyle; + sThemeUrl = "file://" SRC_ROOT "/icon-themes/" + maCurrentStyle; } else if (maCurrentStyle != "default") { -- cgit