Simplify jfw::VersionInfo

Change-Id: I2cc1071bbaf9c68fbd621d6c0c6953b7646b1a62

2 files changed, 5 insertions, 27 deletions

diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index a2c17bfcaeb0..f99861a83051 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -318,27 +318,11 @@ public:
 };
 
 
-class VersionInfo
+struct VersionInfo
 {
     ::std::vector< OUString> vecExcludeVersions;
-    rtl_uString ** arVersions;
-
-public:
-    VersionInfo();
-    ~VersionInfo();
-
-    void addExcludeVersion(const OUString& sVersion);
-
     OUString sMinVersion;
     OUString sMaxVersion;
-
-    /** The caller DOES NOT get ownership of the strings. That is he
-        does not need to release the strings.
-        The array exists as long as this object exists.
-    */
-
-    rtl_uString** getExcludeVersions();
-    sal_Int32 getExcludeVersionSize();
 };
 
 } //end namespace
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index d4febd726d18..d456fe74a59c 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -88,9 +88,7 @@ enum class javaPluginError
         [in] represents the maximum version of a JRE. The string can be empty.
     @param arExcludeList
         [in] contains a list of &quot;bad&quot; versions. JREs which have one of these
-        versions must not be returned by this function. It can be NULL.
-    @param nSizeExcludeList
-        [in] the number of version strings contained in <code>arExcludeList</code>.
+        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.
@@ -111,8 +109,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     OUString const& sVendor,
     OUString const& sMinVersion,
     OUString const& sMaxVersion,
-    rtl_uString * * arExcludeList,
-    sal_Int32  nSizeExcludeList,
+    std::vector<OUString> const & arExcludeList,
     JavaInfo*** parJavaInfo,
     sal_Int32 *nSizeJavaInfo,
     std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos);
@@ -136,9 +133,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
        [in] represents the maximum version of a JRE.
    @param arExcludeList
        [in] contains a list of &quot;bad&quot; versions. JREs which have one of these
-        versions must not be returned by this function. It can be NULL.
-   @param nSizeExcludeList
-       [in] the number of version strings contained in <code>arExcludeList</code>.
+        versions must not be returned by this function.
    @param ppInfo
        [out] if the function runs successfully then <code>ppInfo</code> contains
         on return a pointer to a <code>JavaInfo</code> object.
@@ -162,8 +157,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     OUString const& sVendor,
     OUString const& sMinVersion,
     OUString const& sMaxVersion,
-    rtl_uString * *arExcludeList,
-    sal_Int32  nSizeExcludeList,
+    std::vector<OUString> const &arExcludeList,
     JavaInfo ** ppInfo);