diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-11 11:04:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-11 14:13:03 +0200 |
| commit | 7de833a626cea8cd741ba1d971fea6f0c3a2660b (patch) | |
| tree | 2750dbed735b4df7a9e82add532df49049cc52e8 /filter/source | |
| parent | 6f9f9491bdef676f969898bd653db9905d14f5e8 (diff) | |
simplify calls OUString::copy in foo.copy(x, foo.getLength() - x)
Change-Id: I20318c77dcc3bc2a64336541ef5a3f412bfd9483
Reviewed-on: https://gerrit.libreoffice.org/39803
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/config/cache/querytokenizer.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index cb2b3744fc2f..a7f5b3e8be1d 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -48,7 +48,7 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery) if (equal > 0) { sKey = sToken.copy(0 , equal ); - sVal = sToken.copy(equal+1, sToken.getLength()-(equal+1)); + sVal = sToken.copy(equal+1); } if (find(sKey) != end()) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index c79056f9dbf2..a13589eaea44 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1337,7 +1337,7 @@ void EscherPropertyContainer::CreateEmbeddedBitmapProperties( nIndex += aVndUrl.getLength(); if( rBitmapUrl.getLength() > nIndex ) { - OString aUniqueId(OUStringToOString(rBitmapUrl.copy(nIndex, rBitmapUrl.getLength() - nIndex), RTL_TEXTENCODING_UTF8)); + OString aUniqueId(OUStringToOString(rBitmapUrl.copy(nIndex), RTL_TEXTENCODING_UTF8)); bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId ); if( bRetValue ) { @@ -1540,7 +1540,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( { nIndex = nIndex + aVndUrl.getLength(); if ( aGraphicUrl.getLength() > nIndex ) - aUniqueId = OUStringToOString(aGraphicUrl.copy(nIndex, aGraphicUrl.getLength() - nIndex), RTL_TEXTENCODING_UTF8); + aUniqueId = OUStringToOString(aGraphicUrl.copy(nIndex), RTL_TEXTENCODING_UTF8); } else { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index b30a00c2bdce..1b290223458b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6998,7 +6998,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport if ( nCount ) { pBefCPS = new PPTCharPropSet( *pSet ); - pSet->maString = pSet->maString.copy(nCount, pSet->maString.getLength() - nCount); + pSet->maString = pSet->maString.copy(nCount); } sal_uInt32 nIdx = n; sal_Int32 nHyperLenLeft = nHyperLen; |