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 /idl/source | |
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 'idl/source')
-rw-r--r-- | idl/source/prj/command.cxx | 2 | ||||
-rw-r--r-- | idl/source/prj/database.cxx | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 29b01d11219a..b665d792d8bb 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -154,7 +154,7 @@ static bool ResponseFile( std::vector<OUString> * pList, int argc, char ** argv static_cast<unsigned char>(aStr[n]) ) ) n++; if( n != nPos ) - pList->push_back( OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ); + pList->push_back( OStringToOUString(aStr.subView(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ); } } } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 37bf552c76e2..de8aad3d9b74 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -22,6 +22,8 @@ #include <algorithm> #include <stdio.h> #include <stdlib.h> +#include <string_view> + #include <database.hxx> #include <globals.hxx> #include <rtl/strbuf.hxx> @@ -129,7 +131,7 @@ void SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal ) pIdTable->Insert( rIdName, &nHash )->SetValue( nVal ); } -bool SvIdlDataBase::ReadIdFile( const OString& rOFileName ) +bool SvIdlDataBase::ReadIdFile( std::string_view rOFileName ) { OUString rFileName = OStringToOUString(rOFileName, RTL_TEXTENCODING_ASCII_US); OUString aFullName; @@ -506,7 +508,7 @@ struct WriteDep { SvFileStream & m_rStream; explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { } - void operator() (OUString const& rItem) + void operator() (std::u16string_view rItem) { m_rStream.WriteCharPtr( " \\\n " ); m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); @@ -519,7 +521,7 @@ struct WriteDummy { SvFileStream & m_rStream; explicit WriteDummy(SvFileStream & rStream) : m_rStream(rStream) { } - void operator() (OUString const& rItem) + void operator() (std::u16string_view rItem) { m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); m_rStream.WriteCharPtr( " :\n\n" ); @@ -529,7 +531,7 @@ struct WriteDummy } void SvIdlDataBase::WriteDepFile( - SvFileStream & rStream, OUString const& rTarget) + SvFileStream & rStream, std::u16string_view rTarget) { rStream.WriteOString( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8) ); rStream.WriteCharPtr( " :" ); |