diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-12 23:10:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 07:47:48 +0200 |
| commit | 1a2afa01c98b6edefaaf18590d6e55c3a9731920 (patch) | |
| tree | 3b3aedbbe3756e125cdad8638db11064d8647b25 /include/jvmfwk | |
| parent | 3c3f7d784eadd60c053284ec2835675f158d4156 (diff) | |
Simplify passing options to jfw_startVM
Change-Id: Idac31e282fe4df69449298a03d491473e460c742
Reviewed-on: https://gerrit.libreoffice.org/36495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/jvmfwk')
| -rw-r--r-- | include/jvmfwk/framework.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index d6059bb640af..afab60eef427 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -454,9 +454,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath( @param pInfo [in] optional pointer to a specific JRE; must be caller-freed if not NULL @param arOptions - [in] the array containing additional start arguments or NULL. - @param nSize - [in] the size of the array <code>arOptions</code>. + [in] the vector containing additional start arguments. @param ppVM [out] the <code>JavaVM</code> pointer. @param ppEnv @@ -484,7 +482,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath( <code>JAVA_HOME</code>does not meet the version requirements. */ JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM( - JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize, + JavaInfo const * pInfo, std::vector<OUString> const & arOptions, JavaVM ** ppVM, JNIEnv ** ppEnv); /** determines the JRE that is to be used. |