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 --- extensions/source/bibliography/general.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/source/bibliography/general.cxx') diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index deaaafa4d9dc..1d2f66517a10 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -423,7 +423,7 @@ void BibGeneralPage::CommitActiveControl() } void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText &rLabel, - OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector &rChildren) + OUString& rErrorString, std::string_view sHelpId, sal_uInt16 nIndexInFTArray, std::vector &rChildren) { const OUString aColumnUIName(rLabel.GetText()); // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT @@ -448,7 +448,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText bool BibGeneralPage::AddXControl( const OUString& rName, - FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex, + FixedText& rLabel, std::string_view sHelpId, sal_Int16& rIndex, std::vector& rChildren) { uno::Reference< awt::XControlModel > xCtrModel; -- cgit