diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-06 20:01:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-11 11:58:37 +0100 |
| commit | 93c64a61f2c84e684050294a1391cd32425b7837 (patch) | |
| tree | 00aad2cb8f3ee29ba4ac99e159e26fb8d71d2f33 /xmloff/source/draw | |
| parent | 1fde62018c8d3344a3408c7b6317120aefc778fb (diff) | |
loplugin:stringview
Add new methods "subView" to O(U)String to return substring views
of the underlying data.
Add a clang plugin to warn when replacing existing calls to copy()
would be better to use subView().
Change-Id: I03a5732431ce60808946f2ce2c923b22845689ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105420
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index da40af685b0b..32cf74b8a799 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2365,7 +2365,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( OUString newStreamURL = "vnd.sun.star.Package:"; if (sInternalURL[0] == '#') { - newStreamURL += sInternalURL.copy(1, sInternalURL.getLength() - 1); + newStreamURL += sInternalURL.subView(1, sInternalURL.getLength() - 1); } else { @@ -3784,8 +3784,8 @@ static void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUStr nIndex = aStr.indexOf( '?', nIndex ); if ( nIndex != -1 ) { - aStr = aStr.copy(0, nIndex + 1) + "f" - + aStr.copy(nIndex + 1, aStr.getLength() - nIndex - 1); + aStr = OUString::Concat(aStr.subView(0, nIndex + 1)) + "f" + + aStr.subView(nIndex + 1, aStr.getLength() - nIndex - 1); nIndex++; } } while( nIndex != -1 ); diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 9082528b05c9..b3e5dee8fc10 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1209,9 +1209,9 @@ void XMLEnhancedCustomShapeContext::endFastElement(sal_Int32 ) EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - OUString aNew = rEquation.copy( 0, nIndexOf + 1 ) + + OUString aNew = rEquation.subView( 0, nIndexOf + 1 ) + OUString::number( nIndex ) + - rEquation.copy( nIndexOf + aEquationName.getLength() + 1 ); + rEquation.subView( nIndexOf + aEquationName.getLength() + 1 ); rEquation = aNew; } nIndexOf++; |