diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-25 16:43:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-31 08:34:21 +0200 |
| commit | e2451bd729d0f1d795a5b689deba65bc4e9d92c6 (patch) | |
| tree | 4f2356107b0e58db7afda0fc324b9eac49ff68c0 /jvmfwk | |
| parent | 460b52838fdad0352188bdd877b69cbb5f17ca63 (diff) | |
Convert indexOf->startsWith and lastIndexOf->endsWith
This is both an optimisation and a cleanup.
This converts code like
aStr.indexOf("XX") == 0
to
aStr.startsWith("XX")
and converts code like
aStr.lastIndexOf("XXX") == aStr.getLength() - 3
to
aStr.endsWith("XXX")
Note that in general
aStr.lastIndexOf("X") == aStr.getLength() - 1
converts to
aStr.isEmpty() || aStr.endsWith("X")
so I used the surrounding context to determine if aStr could be empty
when modifying the code.
Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 832616f42e6c..b1d75f7e6c86 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -719,7 +719,7 @@ bool getJREInfoFromBinPath( //make sure argument path does not end with '/' OUString sBinPath = path; - if (path.lastIndexOf('/') == (path.getLength() - 1)) + if (path.endsWith("/")) sBinPath = path.copy(0, path.getLength() - 1); typedef vector<OUString>::const_iterator c_it; @@ -1063,8 +1063,8 @@ Reference<VendorBase> createInstance(createInstance_func pFunc, inline OUString getDirFromFile(const OUString& usFilePath) { - sal_Int32 index= usFilePath.lastIndexOf('/'); - return OUString(usFilePath.getStr(), index); + sal_Int32 index = usFilePath.lastIndexOf('/'); + return usFilePath.copy(0, index); } void createJavaInfoFromPath(vector<rtl::Reference<VendorBase> >& vecInfos) |