From f1bbafc584ba538c21ee156e411903ed142cac2a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann
Date: Tue, 11 Apr 2017 22:25:23 +0200
Subject: Convert rtl_uString -> OUString in jfw_get/setVMParameters
Change-Id: I55f96873661f686cd9625d69523718ccb54659dc
---
include/jvmfwk/framework.hxx | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
(limited to 'include/jvmfwk/framework.hxx')
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
#include
-#include
#include
#include
#include "jni.h"
@@ -587,9 +586,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled);
@param arParameters
- [in] contains the arguments. It can be NULL if nSize is 0.
- @param nSize
- [i] the size of arArgs
+ [in] contains the arguments.
@return
JFW_E_NONE function ran successfully.
@@ -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 const & arArgs);
/** obtains the currently used start parameters.
- The caller needs to free the returned array with
- rtl_freeMemory
. The contained strings must be released with
- rtl_uString_release
.
-
-
@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
- parParameters
@return
JFW_E_NONE function ran successfully.
@@ -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 * parParameters);
/** sets the user class path.
--
cgit