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

Fix mis-merge

Browse source 
d4b1d9b755 "sb123: #i111655# when, within build
env, calling javaldx within OOo installation sets, set UNO_JAVA_JFW_ENV_JREHOME,
but not UNO_JAVA_JFW_ENV_CLASSPATH" had removed the

  -env:UNO_JAVA_JFW_ENV_CLASSPATH=true

arg, but 8c59580b88 "Merge commit
'ooo/DEV300_m101' into integration/dev300_m101", in what looks like an
accidental mis-merge, brought it back

Change-Id: If2313642a1a737c9711fb36dcab5c340bf7dcecb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2020-02-06 19:38:46 +01:00
parent b6bd4803b8
commit 5090ee7e32
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
unotest/source/cpp/officeconnection.cxx
View file

@ -66,11 +66,10 @@ void OfficeConnection::setUp() {
OUString userArg("-env:UserInstallation=" + toAbsoluteFileUrl(argUser));
OUString jreArg(
"-env:UNO_JAVA_JFW_ENV_JREHOME=true");
OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
rtl_uString * args[] = {
noquickArg.pData, norestoreArg.pData,
nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData,
jreArg.pData, classpathArg.pData };
jreArg.pData };
rtl_uString ** envs = nullptr;
OUString argEnv;
if (detail::getArgument("env", &argEnv))