summaryrefslogtreecommitdiff
path: root/include/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-11 22:25:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-12 09:36:20 +0200
commitf1bbafc584ba538c21ee156e411903ed142cac2a (patch)
tree34a471868cbb85ea7aa26413fe87e5afac4781ec /include/jvmfwk
parent61f43d0327c81bb2df88734c9572e489e4a9de31 (diff)
Convert rtl_uString -> OUString in jfw_get/setVMParameters
Change-Id: I55f96873661f686cd9625d69523718ccb54659dc
Diffstat (limited to 'include/jvmfwk')
-rw-r--r--include/jvmfwk/framework.hxx19
1 files changed, 3 insertions, 16 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index c0aff6841682..d6059bb640af 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -29,7 +29,6 @@
#include <jvmfwk/jvmfwkdllapi.hxx>
#include <rtl/byteseq.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <osl/mutex.h>
#include "jni.h"
@@ -587,9 +586,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled);
</p>
@param arParameters
- [in] contains the arguments. It can be NULL if nSize is 0.
- @param nSize
- [i] the size of <code>arArgs</code>
+ [in] contains the arguments.
@return
JFW_E_NONE function ran successfully.<br/>
@@ -599,21 +596,12 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled);
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(
- rtl_uString ** arArgs, sal_Int32 nSize);
+ std::vector<OUString> const & arArgs);
/** obtains the currently used start parameters.
- <p>The caller needs to free the returned array with
- <code>rtl_freeMemory</code>. The contained strings must be released with
- <code>rtl_uString_release</code>.
- </p>
-
@param parParameters
[out] on returns contains a pointer to the array of the start arguments.
- If *parParameters is not NULL then the value is overwritten.
- @param pSize
- [out] on return contains the size of array returned in
- <code>parParameters</code>
@return
JFW_E_NONE function ran successfully.<br/>
@@ -623,8 +611,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(
- rtl_uString *** parParameters,
- sal_Int32 * pSize);
+ std::vector<OUString> * parParameters);
/** sets the user class path.