From c04499bce3783b39b3636db4ff8b2807424ee497 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Tue, 3 Oct 2017 11:48:34 +0530 Subject: framework, lok: It's okay to have valid non-existent user inst. path Change-Id: I3b9f00adb76fc702e1847d9fab866b7796cfd942 Reviewed-on: https://gerrit.libreoffice.org/43061 Reviewed-by: Jan Holesovsky Tested-by: Jenkins (cherry picked from commit 9127d1a89cbfba89eb9df6755ea7b9e161cfc67a) Reviewed-on: https://gerrit.libreoffice.org/43064 Tested-by: Jan Holesovsky --- framework/source/services/substitutepathvars.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'framework') diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 0bbc05563b8d..bda288e26097 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -19,6 +19,7 @@ #include +#include #include #include #include @@ -638,7 +639,10 @@ void SubstitutePathVariables::SetPredefinedPathVariables() //Therefore we do not assert here. // It's not possible to detect when an empty value would actually be used. // (note: getenv is a hack to detect if we're running in a unit test) - if (aState == ::utl::Bootstrap::PATH_EXISTS || getenv("SRC_ROOT")) { + // Also, it's okay to have an empty user installation path in case of LOK + if (aState == ::utl::Bootstrap::PATH_EXISTS || getenv("SRC_ROOT") || + (comphelper::LibreOfficeKit::isActive() && aState == ::utl::Bootstrap::PATH_VALID)) + { m_aPreDefVars.m_FixedVar[ PREDEFVAR_USERPATH ] = sVal; } -- cgit