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 /cppu | |
| 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 'cppu')
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 3 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 2 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index c0dc02c243ad..b93b43b64e78 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -199,7 +199,8 @@ static void LogProbe( { OString sTemp; if ( pMemberType && pMemberType->pTypeName ) - sTemp = OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); + sTemp = OUStringToOString( + OUString::unacquired(&pMemberType->pTypeName),RTL_TEXTENCODING_ASCII_US); if ( pre ) { SAL_INFO("cppu.log", "{ LogBridge () " << sTemp ); diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 5d0d0b84f573..21f84241f578 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -279,7 +279,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() typelib_TypeDescriptionReference * pTDR = rEntry.second; if (pTDR) { - OString aTypeName( OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); + OString aTypeName( OUStringToOString( OUString::unacquired(&pTDR->pTypeName), RTL_TEXTENCODING_ASCII_US ) ); SAL_INFO("cppu.typelib", "remaining type: " << aTypeName << "; ref count = " << pTDR->nRefCount); } else diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 3a86f9882b7f..93a6a1bb588f 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -41,6 +41,7 @@ #include "prim.hxx" #include "loadmodule.hxx" +#include <string_view> #include <unordered_map> #include <vector> #include <stdio.h> @@ -672,7 +673,7 @@ void writeLine( void writeLine( - void * stream, const OUString & rLine, const char * pFilter ) + void * stream, std::u16string_view rLine, const char * pFilter ) { OString aLine( OUStringToOString( rLine, RTL_TEXTENCODING_ASCII_US ) ); @@ -777,7 +778,8 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName( else { writeLine( - stream, "environment \"" + OUString::unacquired(&pEnvDcp) + "\" does not exist!", + stream, + OUString("environment \"" + OUString::unacquired(&pEnvDcp) + "\" does not exist!"), pFilter ); } } |