diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-06-05 10:21:44 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-06-08 09:18:42 +0200 |
| commit | 452856addb26a24846505061b08e2dd64a9c5b5f (patch) | |
| tree | ca46f93af4635c44596895994dd90ff8d22e3a5f /jvmfwk | |
| parent | 40725c05ae1eee580a9b974363fd8921c65b5d17 (diff) | |
Revert "Allow bootstrap variables in Java user classpath settings"
This breaks existing paths which contain "\" or "$".
This reverts commit cfc2376f804f13eb562f39182cb24fe7dc61d6ef.
Change-Id: Ia58df0a4f061f45140575e89231bd18d044a9bc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152604
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 33b61f1622fd..5f83e7be739e 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -185,10 +185,7 @@ javaFrameworkError jfw_startVM( return JFW_E_NEED_RESTART; vmParams = settings.getVmParametersUtf8(); - // Expand user classpath (might contain bootstrap vars) - OUString sUserPath(settings.getUserClassPath()); - rtl::Bootstrap::expandMacros(sUserPath); - sUserClassPath = jfw::makeClassPathOption(sUserPath); + sUserClassPath = jfw::makeClassPathOption(settings.getUserClassPath()); } // end mode FWK_MODE_OFFICE else if (mode == jfw::JFW_MODE_DIRECT) { |