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 /unodevtools/source | |
| 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 'unodevtools/source')
| -rw-r--r-- | unodevtools/source/unodevtools/options.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index ec0264635a2b..1697d71a66fc 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -93,8 +93,8 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, const OUString dash("-"); OUString aOpt = OUString::createFromAscii(pOpt); - if((aArg.indexOf(dash) == 0 && aOpt.equalsIgnoreAsciiCase(aArg.copy(1))) || - (aArg.indexOf(dashdash) == 0 && aOpt.equalsIgnoreAsciiCase(aArg.copy(2))) ) + if((aArg.startsWith(dash) && aOpt.equalsIgnoreAsciiCase(aArg.copy(1))) || + (aArg.startsWith(dashdash) && aOpt.equalsIgnoreAsciiCase(aArg.copy(2))) ) { ++(*pnIndex); *pbOpt = sal_True; |