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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 87bf6a6c41be..5902669c8df4 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1592,7 +1592,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void) // display Unicode position as symbol name while iterating over characters const OUString aHex(OUString::number(cChar, 16).toAsciiUpperCase()); const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") ); - OUString aUnicodePos = aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) + + OUString aUnicodePos = aPattern.subView( 0, aPattern.getLength() - aHex.getLength() ) + aHex; m_xSymbols->set_entry_text(aUnicodePos); m_xSymbolName->set_label(aUnicodePos); diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 779f27add50d..5290ad12606c 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -420,7 +420,7 @@ OUString SmOoxmlImport::handleFunc() OUString fname = readOMathArgInElement( M_TOKEN( fName )); // fix the various functions if( fname.startsWith( "lim csub {" )) - fname = "lim from {" + fname.copy( 10 ); + fname = OUString::Concat("lim from {") + fname.subView( 10 ); OUString ret = fname + " {" + readOMathArgInElement( M_TOKEN( e )) + "}"; m_rStream.ensureClosingTag( M_TOKEN( func )); return ret; @@ -435,9 +435,9 @@ OUString SmOoxmlImport::handleLimLowUpp( LimLowUpp_t limlowupp ) m_rStream.ensureClosingTag( token ); // fix up overbrace/underbrace (use { }, as {} will be converted to a placeholder) if( limlowupp == LimUpp && e.endsWith( " overbrace { }" )) - return e.copy( 0, e.getLength() - 2 ) + lim + "}"; + return e.subView( 0, e.getLength() - 2 ) + lim + "}"; if( limlowupp == LimLow && e.endsWith( " underbrace { }" )) - return e.copy( 0, e.getLength() - 2 ) + lim + "}"; + return e.subView( 0, e.getLength() - 2 ) + lim + "}"; return e + ( limlowupp == LimLow ? OUStringLiteral( u" csub {" ) : OUStringLiteral( u" csup {" )) + lim + "}"; |