From 1a2afa01c98b6edefaaf18590d6e55c3a9731920 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 12 Apr 2017 23:10:11 +0200 Subject: Simplify passing options to jfw_startVM Change-Id: Idac31e282fe4df69449298a03d491473e460c742 Reviewed-on: https://gerrit.libreoffice.org/36495 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- include/jvmfwk/framework.hxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/jvmfwk/framework.hxx') 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 arOptions. + [in] the vector containing additional start arguments. @param ppVM [out] the JavaVM pointer. @param ppEnv @@ -484,7 +482,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath( JAVA_HOMEdoes not meet the version requirements. */ JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM( - JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize, + JavaInfo const * pInfo, std::vector const & arOptions, JavaVM ** ppVM, JNIEnv ** ppEnv); /** determines the JRE that is to be used. -- cgit value='distro/cib/libreoffice-5-4'>distro/cib/libreoffice-5-4