diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-06 19:38:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-06 22:22:23 +0100 |
| commit | 5090ee7e32e1314285903eb6b30cf128e1195a2a (patch) | |
| tree | 67ba760ba7542c523e36d1dd2f00697af58d3a59 /unotest | |
| parent | b6bd4803b86ff7761f72081bb44229f492fe6133 (diff) | |
Fix mis-merge
d4b1d9b75572fdcc55a925254943a3cf29354f98 "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 8c59580b88a33d7f0c892c9c53776716ad661fcf "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>
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index f89465b2c492..7a15161031e5 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -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)) |