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 /vcl/generic | |
| 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 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 91e638a592d6..636528a6eff6 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -360,7 +360,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, if( m_aStyleName.isEmpty() && pInfo->gfi->fullName && *pInfo->gfi->fullName ) { OUString aFullName( OStringToOUString( pInfo->gfi->fullName, RTL_TEXTENCODING_ISO_8859_1 ) ); - if( aFullName.indexOf( aFamily ) == 0 ) + if( aFullName.startsWith( aFamily ) ) m_aStyleName = WhitespaceToSpace( aFullName.copy( aFamily.getLength() ) ); } @@ -2533,7 +2533,7 @@ std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OStri if( aRet.begin() == aRet.end() ) { - if( rName.getLength() == 7 && rName.indexOf( "uni" ) == 0 ) + if( rName.getLength() == 7 && rName.startsWith( "uni" ) ) { sal_Unicode aCode = (sal_Unicode)rName.copy( 3 ).toUInt32( 16 ); aRet.push_back( aCode ); |