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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/core/drawdoc2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 4a77d2a949f7..c02da25b60ca 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -321,7 +321,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ aURLCopy = aURLCopy.replaceAt(0, aHashSlide.getLength(), ""); bool bNotesLink = ( aURLCopy.getLength() >= sNotes.getLength() + 3 - && aURLCopy.indexOf(sNotes, aURLCopy.getLength() - sNotes.getLength()) == aURLCopy.getLength() - sNotes.getLength() ); + && aURLCopy.endsWith(sNotes) ); if (bNotesLink ^ bNotes) continue; // no compatible link and page diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 4ce381f2fe9a..998621904da5 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1502,7 +1502,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, // #i121863# search in source styles with original style name from source of // evtl. cloned master (not-cloned, renamed for uniqueness) - if( aName.indexOf( aOriginalNewLayoutName ) == 0 ) + if( aName.startsWith( aOriginalNewLayoutName ) ) { // #i121863# build name of evtl. cloned master style to search for if(aOriginalNewLayoutName != aTargetNewLayoutName) |