From 042033f1e6da22616cb76c8d950c20c9efecbad5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 28 Dec 2020 17:56:40 +0100 Subject: loplugin:stringviewparam: operator + Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- helpcompiler/source/HelpIndexer.cxx | 6 +++--- helpcompiler/source/HelpLinker.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'helpcompiler') diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index dca372ea3700..b8889a619ee9 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -23,12 +23,12 @@ using namespace lucene::document; HelpIndexer::HelpIndexer(OUString const &lang, OUString const &module, - OUString const &srcDir, OUString const &outDir) + std::u16string_view srcDir, std::u16string_view outDir) : d_lang(lang), d_module(module) { d_indexDir = outDir + OUStringChar('/') + module + ".idxl"; - d_captionDir = srcDir + "/caption"; - d_contentDir = srcDir + "/content"; + d_captionDir = OUString::Concat(srcDir) + "/caption"; + d_contentDir = OUString::Concat(srcDir) + "/content"; } bool HelpIndexer::indexDocuments() diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 166ff9918f76..b272d2c010e5 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -848,7 +848,7 @@ bool compileExtensionHelp ( const OUString& aOfficeHelpPath, std::u16string_view aExtensionName, - const OUString& aExtensionLanguageRoot, + std::u16string_view aExtensionLanguageRoot, sal_Int32 nXhpFileCount, const OUString* pXhpFiles, std::u16string_view aDestination, HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo @@ -905,7 +905,7 @@ bool compileExtensionHelp // The following basically checks if the help.tree is well formed XML. // Apparently there have been cases when translations contained // non-well-formed XML in the past. - OUString aTreeFileURL = aExtensionLanguageRoot + "/help.tree"; + OUString aTreeFileURL = OUString::Concat(aExtensionLanguageRoot) + "/help.tree"; osl::DirectoryItem aTreeFileItem; osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem ); osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize ); -- cgit