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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/pfiledlg.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galini.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 213808126d0b..62f3db4bfbe7 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -90,8 +90,8 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) aStrPlugMIMEType = aStrPlugMIMEType.toAsciiLowerCase(); aStrPlugExtension = aStrPlugExtension.toAsciiLowerCase(); - if ( ( nKind == SID_INSERT_SOUND && aStrPlugMIMEType.indexOf( sAudio ) == 0 ) || - ( nKind == SID_INSERT_VIDEO && aStrPlugMIMEType.indexOf( sVideo ) == 0 ) ) + if ( ( nKind == SID_INSERT_SOUND && aStrPlugMIMEType.startsWith( sAudio ) ) || + ( nKind == SID_INSERT_VIDEO && aStrPlugMIMEType.startsWith( sVideo ) ) ) { // extension already in the filterlist of the filedlg ? bool bAlreadyExist = false; diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx index 815653982dd1..45673fc11ad0 100644 --- a/svx/source/gallery2/galini.cxx +++ b/svx/source/gallery2/galini.cxx @@ -47,7 +47,7 @@ OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName ) sal_Int32 n; // comments - if( aLine.indexOf( '#' ) == 0 ) + if( aLine.startsWith( "#" ) ) continue; // a[en_US] = Bob |