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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ieps/ieps.cxx | 6 | ||||
| -rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 61473f6925f8..7da240f92059 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -225,10 +225,10 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r if (pOut) { rtl::ByteSequence seq; - if (osl_File_E_None == osl_readLine(pOut, (sal_Sequence **)&seq)) + if (osl_File_E_None == osl_readLine(pOut, (sal_Sequence **)&seq)) { - OString line( (const sal_Char *) seq.getConstArray(), seq.getLength() ); - if (line.indexOf(OString("Unsupported output format")) == 0) + OString line( (const sal_Char *) seq.getConstArray(), seq.getLength() ); + if (line.startsWith("Unsupported output format")) bEMFSupported=false; } osl_closeFile(pOut); diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index e5c72e59e000..8422d62fe79f 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -317,7 +317,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro { SvtPathOptions aPathOpt; OUString aAddinPath = aPathOpt.GetAddinPath(); - if( OUString( sDocUrlOrPath ).indexOf( aAddinPath ) == 0 ) + if( sDocUrlOrPath.startsWith( aAddinPath ) ) pFoundShell = pShell; } if( !pFoundShell ) @@ -751,7 +751,7 @@ void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, c if ( !MacroName.isEmpty() ) { OUString aMacroName = MacroName.trim(); - if (0 == aMacroName.indexOf('!')) + if( aMacroName.startsWith("!") ) MacroName = aMacroName.copy(1).trim(); SfxObjectShell* pShell = NULL; if ( rxModel.is() ) |