strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix vcldemo lookup of icons

Browse source 
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 <noel.grandin@collabora.co.uk>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák 2019-10-29 17:20:37 +01:00
parent 282126c22c
commit 998057c36b
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config_host/config_folders.h.in
View file

@ -45,4 +45,10 @@
#undef LIBO_URE_MISC_FOLDER
#undef LIBO_URE_SHARE_JAVA_FOLDER
/* the source root directory of the build */
#undef SRC_ROOT
/* the build directory of the build */
#undef BUILDDIR
#endif

1
configure.ac
View file

@ -332,6 +332,7 @@ AC_SUBST(SRC_ROOT)
AC_SUBST(BUILDDIR)
AC_SUBST(x_Cygwin)
AC_DEFINE_UNQUOTED(SRCDIR,"$SRC_ROOT")
AC_DEFINE_UNQUOTED(SRC_ROOT,"$SRC_ROOT")
AC_DEFINE_UNQUOTED(BUILDDIR,"$BUILDDIR")
if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then

8
vcl/source/image/ImplImageTree.cxx
View file

@ -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")
{