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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/usercontrol.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 778175ba51b7..ad2e2e9b7d77 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -492,7 +492,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); - if ( sTmp.indexOf('_') == 0 ) + if ( sTmp.startsWith("_") ) sTmp = sTmp.copy(1); // do we own the memory for pTypeLib, msdn doco is vague // I'll assume we do diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index c0ca42f322a8..9433c6d0f559 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -283,7 +283,7 @@ namespace pcr OUString sURL; if ( ( _rValue >>= sURL ) ) { - if ( sURL.indexOf( "vnd.sun.star.GraphicObject:" ) == 0 ) + if ( sURL.startsWith( "vnd.sun.star.GraphicObject:" ) ) getTypedControlWindow()->DisplayURL( getTypedControlWindow()->GetPlaceHolder() ); else getTypedControlWindow()->DisplayURL( sURL ); |