diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 17:11:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 21:41:24 +0100 |
| commit | 5dcdb35ab1e99dbeb283d3694ab7ebba354e9197 (patch) | |
| tree | cf58a8092a68f07e3d4392eb423a596940cdcbae /jvmfwk/plugins | |
| parent | Manage JavaInfo instances via new/delete (diff) | |
| download | core-5dcdb35ab1e99dbeb283d3694ab7ebba354e9197.tar.gz core-5dcdb35ab1e99dbeb283d3694ab7ebba354e9197.zip | |
Turn JavaInfo rtl_uString* members into OUString
Change-Id: Ieb23b0c36ef56a4793a56cdb450df34e4d9bce1d
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
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 |