From 35e471bb4d1388cf5afcdcee214cf5111edf44e3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 11 Dec 2020 17:44:34 +0100 Subject: 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 --- writerperfect/source/common/WPXSvInputStream.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'writerperfect/source') diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index ce5ff2956966..2af8475ee99e 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -623,7 +624,7 @@ bool WPXSvInputStreamImpl::existsSubStream(const char* const name) PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8)); + const OUString aName(OStringToOUString(std::string_view(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { @@ -653,7 +654,7 @@ librevenge::RVNGInputStream* WPXSvInputStreamImpl::getSubStreamByName(const char PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8)); + const OUString aName(OStringToOUString(std::string_view(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { -- cgit