diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 16:54:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 17:32:44 +0200 |
| commit | f276171835c7b820ba271e7d3c28d6704ec823b0 (patch) | |
| tree | cb9cde159b71fef50465d85d8eecf052c7e1221e /jvmfwk/inc | |
| parent | Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoByPath (diff) | |
| download | core-f276171835c7b820ba271e7d3c28d6704ec823b0.tar.gz core-f276171835c7b820ba271e7d3c28d6704ec823b0.zip | |
Use std::unique_ptr<JavaInfo> in jfw_plugin_getAllJavaInfos
Change-Id: I2beb95c42c666a788a87a45f59bc15ccfcf25aa6
Diffstat (limited to 'jvmfwk/inc')
| -rw-r--r-- | jvmfwk/inc/vendorplugin.hxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx index 141a93689a8e..a8a7a4b3c7ae 100644 --- a/jvmfwk/inc/vendorplugin.hxx +++ b/jvmfwk/inc/vendorplugin.hxx @@ -74,13 +74,6 @@ enum class javaPluginError The JavaInfo structures returned in <code>parJavaInfo</code> should be ordered according to their version. The one, representing a JRE with the highest version should be the first in the array. </p> - <p> - The function allocates memory for an array and all the JavaInfo objects returned - in <code>parJavaInfo</code>. The caller must delete each JavaInfo object. - The array is to be - freed by rtl_freeMemory. - In case an error occurred <code>parJavaInfo</code> need not be freed. - </p> @param sVendor [in] only JREs from this vendor are examined. This parameter always contains a vendor string. That is, the string it is not empty. @@ -93,10 +86,7 @@ enum class javaPluginError versions must not be returned by this function. @param parJavaInfo [out] if the function runs successfully then <code>parJavaInfo</code> contains - on return an array of pointers to <code>JavaInfo</code> objects. - @param nSizeJavaInfo - [out] the number of <code>JavaInfo</code> pointers contained in - <code>parJavaInfo</code>. + on return a vector of pointers to <code>JavaInfo</code> objects. @return javaPluginError::NONE the function ran successfully.</br> @@ -112,8 +102,7 @@ javaPluginError jfw_plugin_getAllJavaInfos( OUString const& sMinVersion, OUString const& sMaxVersion, std::vector<OUString> const & arExcludeList, - JavaInfo*** parJavaInfo, - sal_Int32 *nSizeJavaInfo, + std::vector<std::unique_ptr<JavaInfo>> * parJavaInfo, std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos); /** obtains information for a JRE at a given location. |