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 /sw/source/filter/html | |
| 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 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlform.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlsect.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 46b29ebf2e51..18c5def4ccf6 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -824,13 +824,13 @@ static void lcl_html_getEvents( const OUString& rOption, const OUString& rValue, { if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdevent ) ) { - OUString aEvent = rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) ) + + OUString aEvent = OUString::Concat(rOption.subView( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) )) + "-" + rValue; rUnoMacroTable.push_back(aEvent); } else if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) ) { - OUString aParam = rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) ) + + OUString aParam = OUString::Concat(rOption.subView( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) )) + "-" + rValue; rUnoMacroParamTable.push_back(aParam); } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index c9208357ceee..d68a22e2e389 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -302,11 +302,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken ) + OUStringChar(sfx2::cTokenSeparator); if( nPos2 == -1 ) { - aURL += aHRef.copy( nPos+1 ); + aURL += aHRef.subView( nPos+1 ); } else { - aURL += aHRef.copy( nPos+1, nPos2 - (nPos+1) ) + aURL += aHRef.subView( nPos+1, nPos2 - (nPos+1) ) + OUStringChar(sfx2::cTokenSeparator) + rtl::Uri::decode( aHRef.copy( nPos2+1 ), rtl_UriDecodeWithCharset, |