diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /tools | |
parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) |
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/fsys/wldcrd.cxx | 2 | ||||
-rw-r--r-- | tools/source/inet/inetmsg.cxx | 4 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 2 | ||||
-rw-r--r-- | tools/source/xml/XmlWriter.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index bf5155dee88b..7608549665ca 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -86,7 +86,7 @@ bool WildCard::ImpMatch( const char *pWild, const char *pStr ) return ( *pStr == '\0' ) && ( *pWild == '\0' ); } -bool WildCard::Matches( const OUString& rString ) const +bool WildCard::Matches( std::u16string_view rString ) const { OString aTmpWild = aWildString; OString aString(OUStringToOString(rString, osl_getThreadTextEncoding())); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 3adf1ebd4487..bb8a700d16f1 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -82,7 +82,7 @@ static sal_uInt16 ParseMonth(const OString& rStr, sal_Int32& nIndex) } bool INetMIMEMessage::ParseDateField ( - const OUString& rDateFieldW, DateTime& rDateTime) + std::u16string_view rDateFieldW, DateTime& rDateTime) { OString aDateField(OUStringToOString(rDateFieldW, RTL_TEXTENCODING_ASCII_US)); @@ -272,7 +272,7 @@ void INetMIMEMessage::EnableAttachMultipartFormDataChild() // Set header fields. SetMIMEVersion("1.0"); SetContentType( - OUString::fromUtf8("multipart/form-data; boundary=" + m_aBoundary)); + "multipart/form-data; boundary=" + OUString::fromUtf8(m_aBoundary)); SetContentTransferEncoding("7bit"); } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 84dcef93bcd5..8448f5144af9 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -706,7 +706,7 @@ bool SvStream::WriteUnicodeOrByteText( const OUString& rStr, rtl_TextEncoding eD } } -bool SvStream::WriteByteStringLine( const OUString& rStr, rtl_TextEncoding eDestCharSet ) +bool SvStream::WriteByteStringLine( std::u16string_view rStr, rtl_TextEncoding eDestCharSet ) { return WriteLine(OUStringToOString(rStr, eDestCharSet)); } diff --git a/tools/source/xml/XmlWriter.cxx b/tools/source/xml/XmlWriter.cxx index eaea3d9c15e4..d05ec2203bc6 100644 --- a/tools/source/xml/XmlWriter.cxx +++ b/tools/source/xml/XmlWriter.cxx @@ -131,7 +131,7 @@ void XmlWriter::attribute(const OString& name, const OString& value) xmlFree(xmlName); } -void XmlWriter::attribute(const OString& name, const OUString& value) +void XmlWriter::attribute(const OString& name, std::u16string_view value) { attribute(name, OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr()); } @@ -153,7 +153,7 @@ void XmlWriter::content(const OString& sValue) xmlFree(xmlValue); } -void XmlWriter::content(const OUString& sValue) +void XmlWriter::content(std::u16string_view sValue) { content(OUStringToOString(sValue, RTL_TEXTENCODING_UTF8)); } |