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 --- unodevtools/source/skeletonmaker/javatypemaker.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'unodevtools') diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index be65870b56ad..a82a1fd1b610 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -34,7 +35,7 @@ namespace skeletonmaker::java { static void printType( std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - codemaker::UnoType::Sort sort, OUString const & nucleus, sal_Int32 rank, + codemaker::UnoType::Sort sort, std::u16string_view nucleus, sal_Int32 rank, std::vector< OUString > const & arguments, bool referenceType, bool defaultvalue) { @@ -623,7 +624,7 @@ static void printServiceMembers( static void printMapsToJavaType( std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - codemaker::UnoType::Sort sort, OUString const & nucleus, sal_Int32 rank, + codemaker::UnoType::Sort sort, std::u16string_view nucleus, sal_Int32 rank, std::vector< OUString > const & arguments, const char * javaTypeSort) { o << "maps to Java 1.5 "; @@ -631,7 +632,7 @@ static void printMapsToJavaType( o << javaTypeSort << ' '; } o << "type \""; - if (rank == 0 && nucleus == "com.sun.star.uno.XInterface") { + if (rank == 0 && nucleus == u"com.sun.star.uno.XInterface") { o << "com.sun.star.uno.XInterface"; } else { printType( -- cgit