diff options
| author | sb <sb@openoffice.org> | 2010-05-17 17:34:10 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-17 17:34:10 +0200 |
| commit | d4b1d9b75572fdcc55a925254943a3cf29354f98 (patch) | |
| tree | 5a4e3c1bbaff5f0fd690dd3e0777ff4b95d4ec57 /test | |
| parent | af5cef5b1e2f3d76f52340bbd2ea8bd93cb5185d (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/cpp/officeconnection.cxx | 5 | ||||
| -rw-r--r-- | test/source/java/OfficeConnection.java | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx index 5ea493f0bd0d..d18f266ecb7d 100644 --- a/test/source/cpp/officeconnection.cxx +++ b/test/source/cpp/officeconnection.cxx @@ -87,12 +87,9 @@ void OfficeConnection::setUp() { toAbsoluteFileUrl(argUser)); rtl::OUString jreArg( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_JREHOME=true")); - rtl::OUString classpathArg( - RTL_CONSTASCII_USTRINGPARAM( - "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true")); rtl_uString * args[] = { noquickArg.pData, nofirstArg.pData, norestoreArg.pData, - acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData }; + acceptArg.pData, userArg.pData, jreArg.pData }; rtl_uString ** envs = 0; rtl::OUString argEnv; if (detail::getArgument( diff --git a/test/source/java/OfficeConnection.java b/test/source/java/OfficeConnection.java index fc6e78f5f108..f87947137167 100644 --- a/test/source/java/OfficeConnection.java +++ b/test/source/java/OfficeConnection.java @@ -57,8 +57,7 @@ public final class OfficeConnection { "-nofirststartwizard", "-norestore", "-accept=" + description + ";urp", "-env:UserInstallation=" + Argument.get("user"), - "-env:UNO_JAVA_JFW_ENV_JREHOME=true", - "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); + "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); String envArg = Argument.get("env"); if (envArg != null) { Map<String, String> env = pb.environment(); |