mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unnecessary OUString instances

Browse Source 
Change-Id: I81a59c7847e2109198a35cbdb49f5bcf3505c4ba
This commit is contained in:
Stephan Bergmann
2017-03-13 17:43:38 +01:00
parent 6661bdb076
commit 849c82495e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
View File

@@ -59,11 +59,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
//javax.accessibility.assistive_technologies from system properties //javax.accessibility.assistive_technologies from system properties
typedef vector<pair<OUString, OUString> >::const_iterator it_prop; typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
OUString sVendorProperty("java.vendor");
OUString sVersionProperty("java.version");
OUString sHomeProperty("java.home");
OUString sArchProperty("os.arch");
OUString sAccessProperty("javax.accessibility.assistive_technologies");
bool bVersion = false; bool bVersion = false;
bool bVendor = false; bool bVendor = false;
@@ -74,17 +69,17 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
typedef vector<pair<OUString, OUString> >::const_iterator it_prop; typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
for (it_prop i = props.begin(); i != props.end(); ++i) for (it_prop i = props.begin(); i != props.end(); ++i)
{ {
if(! bVendor && sVendorProperty.equals(i->first)) if(! bVendor && i->first == "java.vendor")
{ {
m_sVendor = i->second; m_sVendor = i->second;
bVendor = true; bVendor = true;
} }
else if (!bVersion && sVersionProperty.equals(i->first)) else if (!bVersion && i->first == "java.version")
{ {
m_sVersion = i->second; m_sVersion = i->second;
bVersion = true; bVersion = true;
} }
else if (!bHome && sHomeProperty.equals(i->first)) else if (!bHome && i->first == "java.home")
{ {
#ifndef JVM_ONE_PATH_CHECK #ifndef JVM_ONE_PATH_CHECK
OUString fileURL; OUString fileURL;
@@ -105,12 +100,13 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
bHome = true; bHome = true;
#endif #endif
} }
else if (!bArch && sArchProperty.equals(i->first)) else if (!bArch && i->first == "os.arch")
{ {
m_sArch = i->second; m_sArch = i->second;
bArch = true; bArch = true;
} }
else if (!bAccess && sAccessProperty.equals(i->first)) else if (!bAccess
&& i->first == "javax.accessibility.assistive_technologies")
{ {
if (!i->second.isEmpty()) if (!i->second.isEmpty())
{ {