diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-05-25 13:41:16 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-05-25 16:19:00 +0200 |
| commit | cfc2376f804f13eb562f39182cb24fe7dc61d6ef (patch) | |
| tree | 7f1595db0a7bba9118db7b3e69b327b47f65fc75 /jvmfwk/source | |
| parent | 21473f46fda5f1c7f220493667a96fff7c78a7b3 (diff) | |
Allow bootstrap variables in Java user classpath settings
This allows for relative paths to be configured as Java class path.
Change-Id: Ie3e6bc3836fb316457e5c9f11dfb77d2fcd49ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152271
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 5f83e7be739e..33b61f1622fd 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -185,7 +185,10 @@ javaFrameworkError jfw_startVM( return JFW_E_NEED_RESTART; vmParams = settings.getVmParametersUtf8(); - sUserClassPath = jfw::makeClassPathOption(settings.getUserClassPath()); + // Expand user classpath (might contain bootstrap vars) + OUString sUserPath(settings.getUserClassPath()); + rtl::Bootstrap::expandMacros(sUserPath); + sUserClassPath = jfw::makeClassPathOption(sUserPath); } // end mode FWK_MODE_OFFICE else if (mode == jfw::JFW_MODE_DIRECT) { |