Turn JavaInfo rtl_uString* members into OUString

Change-Id: Ieb23b0c36ef56a4793a56cdb450df34e4d9bce1d

5 files changed, 19 insertions, 38 deletions

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index d950c47195a1..57e4dedd20da 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -596,7 +596,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 
         if ( !bFound )
         {
-            jfw_addJRELocation( pInfo->sLocation );
+            jfw_addJRELocation( pInfo->sLocation.pData );
             AddJRE( pInfo );
             m_aAddedInfos.push_back( pInfo );
             nPos = m_pJavaList->GetEntryCount() - 1;
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 6ee43200d983..0380e1f68f7e 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -24,6 +24,7 @@
 
 #include <jvmfwk/jvmfwkdllapi.hxx>
 #include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
 #include <osl/mutex.h>
 #include "jni.h"
 
@@ -219,10 +220,10 @@ struct JavaInfo
         Java system property <code>java.vendor</code>.
         </p>
      */
-    rtl_uString *sVendor;
+    OUString sVendor;
     /** contains the file URL to the installation directory.
     */
-    rtl_uString *sLocation;
+    OUString sLocation;
     /** contains the version of this Java distribution.
 
         <p>The version string  must adhere to the rules
@@ -231,7 +232,7 @@ struct JavaInfo
         equal the Java system property <code>java.version</code>.
         </p>
     */
-    rtl_uString *sVersion;
+    OUString sVersion;
     /** indicates supported special features.
 
         <p>For example, <code>JFW_FEATURE_ACCESSBRIDGE</code> indicates that
@@ -268,9 +269,8 @@ JVMFWK_DLLPUBLIC void jfw_freeJavaInfo(JavaInfo *pInfo);
    <p>Two <code>JavaInfo</code> objects are said to be equal if the contained
    members of the first <code>JavaInfo</code> are equal to their counterparts
    in the second <code>JavaInfo</code> object. The equality of the
-   <code>rtl_uString</code> members is determined
-   by the respective comparison function (see
-   <code>OUString::equals</code>).
+   <code>OUString</code> members is determined
+   by <code>operator ==</code>.
    Similarly the equality of the <code>sal_Sequence</code> is
    also determined by a comparison
    function (see <code>rtl::ByteSequence::operator ==</code>). </p>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index e69420334736..214a50137dd8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -147,15 +147,9 @@ OString getPluginJarPath(
 JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
 {
     JavaInfo* pInfo = new JavaInfo;
-    OUString sVendor = info->getVendor();
-    pInfo->sVendor = sVendor.pData;
-    rtl_uString_acquire(sVendor.pData);
-    OUString sHome = info->getHome();
-    pInfo->sLocation = sHome.pData;
-    rtl_uString_acquire(pInfo->sLocation);
-    OUString sVersion = info->getVersion();
-    pInfo->sVersion = sVersion.pData;
-    rtl_uString_acquire(pInfo->sVersion);
+    pInfo->sVendor = info->getVendor();
+    pInfo->sLocation = info->getHome();
+    pInfo->sVersion = info->getVersion();
     pInfo->nFeatures = info->supportsAccessibility() ? 1 : 0;
     pInfo->nRequirements = info->needsRestart() ? JFW_REQUIRE_NEEDRESTART : 0;
     OUStringBuffer buf(1024);
@@ -692,7 +686,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 #if defined UNX && !defined MACOSX
     //Setting the JAVA_HOME is needed for awt
     OUString sPathLocation;
-    osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
+    osl::FileBase::getSystemPathFromFileURL(pInfo->sLocation, sPathLocation);
     osl_setEnvironment(OUString("JAVA_HOME").pData, sPathLocation.pData);
 #endif
 
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 60a1fa5cbe21..8c6d590283e3 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -979,12 +979,9 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
         return nullptr;
     JavaInfo * pInfo = new JavaInfo;
     memset(pInfo, 0, sizeof(JavaInfo));
-    pInfo->sVendor = sVendor.pData;
-    rtl_uString_acquire(pInfo->sVendor);
-    pInfo->sLocation = sLocation.pData;
-    rtl_uString_acquire(pInfo->sLocation);
-    pInfo->sVersion = sVersion.pData;
-    rtl_uString_acquire(pInfo->sVersion);
+    pInfo->sVendor = sVendor;
+    pInfo->sLocation = sLocation;
+    pInfo->sVersion = sVersion;
     pInfo->nFeatures = nFeatures;
     pInfo->nRequirements = nRequirements;
     pInfo->arVendorData = arVendorData.getHandle();
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index e70e831e54b2..a6cac212bd67 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -630,13 +630,10 @@ bool jfw_areEqualJavaInfo(JavaInfo const * pInfoA,JavaInfo const * pInfoB)
         return true;
     if (pInfoA == nullptr || pInfoB == nullptr)
         return false;
-    OUString sVendor(pInfoA->sVendor);
-    OUString sLocation(pInfoA->sLocation);
-    OUString sVersion(pInfoA->sVersion);
     rtl::ByteSequence sData(pInfoA->arVendorData);
-    if (sVendor.equals(pInfoB->sVendor)
-        && sLocation.equals(pInfoB->sLocation)
-        && sVersion.equals(pInfoB->sVersion)
+    if (pInfoA->sVendor == pInfoB->sVendor
+        && pInfoA->sLocation == pInfoB->sLocation
+        && pInfoA->sVersion == pInfoB->sVersion
         && pInfoA->nFeatures == pInfoB->nFeatures
         && pInfoA->nRequirements == pInfoB->nRequirements
         && sData == pInfoB->arVendorData)
@@ -651,9 +648,6 @@ void jfw_freeJavaInfo(JavaInfo *pInfo)
 {
     if (pInfo == nullptr)
         return;
-    rtl_uString_release(pInfo->sVendor);
-    rtl_uString_release(pInfo->sLocation);
-    rtl_uString_release(pInfo->sVersion);
     rtl_byte_sequence_release(pInfo->arVendorData);
     delete pInfo;
 }
@@ -1081,12 +1075,8 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
 {
     if (pInfo == nullptr)
         return nullptr;
-    JavaInfo* newInfo = new JavaInfo;
-    memcpy(newInfo, pInfo, sizeof(JavaInfo));
-    rtl_uString_acquire(pInfo->sVendor);
-    rtl_uString_acquire(pInfo->sLocation);
-    rtl_uString_acquire(pInfo->sVersion);
-    rtl_byte_sequence_acquire(pInfo->arVendorData);
+    JavaInfo* newInfo = new JavaInfo(*pInfo);
+    rtl_byte_sequence_acquire(newInfo->arVendorData);
     return newInfo;
 }