diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-06 09:23:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 08:34:40 +0000 |
| commit | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch) | |
| tree | d36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /jvmfwk | |
| parent | e1fc599eb764186e5d511ace9785463eebbc7028 (diff) | |
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f
Reviewed-on: https://gerrit.libreoffice.org/19815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 3463e74ce58d..1423c49578e8 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -1038,12 +1038,11 @@ rtl::Reference<VendorBase> getJREInfoByPath( //find java.vendor property typedef vector<pair<OUString, OUString> >::const_iterator c_ip; - OUString sVendor("java.vendor"); OUString sVendorName; for (c_ip i = props.begin(); i != props.end(); ++i) { - if (sVendor.equals(i->first)) + if (i->first == "java.vendor") { sVendorName = i->second; break; @@ -1254,10 +1253,9 @@ void addJavaInfosDirScan( - OUString usFile("file:///"); for( int ii = 0; ii < cSearchPaths; ii ++) { - OUString usDir1(usFile + arPaths[ii]); + OUString usDir1("file:///" + arPaths[ii]); DirectoryItem item; if(DirectoryItem::get(usDir1, item) == File::E_None) { diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 8292fab24fbf..ff178a18166a 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -293,9 +293,7 @@ OString BootParams::getClasspath() OUString BootParams::getVendorSettings() { OUString sVendor; - OUString sName( - UNO_JAVA_JFW_VENDOR_SETTINGS); - if (Bootstrap::get()->getFrom(sName ,sVendor)) + if (Bootstrap::get()->getFrom(UNO_JAVA_JFW_VENDOR_SETTINGS, sVendor)) { //check the value of the bootstrap variable jfw::FileStatus s = checkFileURL(sVendor); @@ -407,17 +405,13 @@ JFW_MODE getMode() bool bDirectMode = true; OUString sValue; const rtl::Bootstrap * aBoot = Bootstrap::get(); - OUString sJREHome(UNO_JAVA_JFW_JREHOME); - if (!aBoot->getFrom(sJREHome, sValue)) + if (!aBoot->getFrom(UNO_JAVA_JFW_JREHOME, sValue)) { - OUString sEnvJRE(UNO_JAVA_JFW_ENV_JREHOME); - if (!aBoot->getFrom(sEnvJRE, sValue)) + if (!aBoot->getFrom(UNO_JAVA_JFW_ENV_JREHOME, sValue)) { - OUString sClasspath(UNO_JAVA_JFW_CLASSPATH); - if (!aBoot->getFrom(sClasspath, sValue)) + if (!aBoot->getFrom(UNO_JAVA_JFW_CLASSPATH, sValue)) { - OUString sEnvClasspath(UNO_JAVA_JFW_ENV_CLASSPATH); - if (!aBoot->getFrom(sEnvClasspath, sValue)) + if (!aBoot->getFrom(UNO_JAVA_JFW_ENV_CLASSPATH, sValue)) { OUString sParams = UNO_JAVA_JFW_PARAMETER + OUString::number(1); |