From f34ac579fac16fff37bf00fe85d43ad6b938eca7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 12 Nov 2020 08:13:40 +0100 Subject: New loplugin:stringviewparam ...to "Find functions that take rtl::O[U]String parameters that can be generalized to take std::[u16]string_view instead." (Which in turn can avoid costly O[U]String constructions, see e.g. loplugin:stringview and subView.) Some of those functions' call sites, passing plain char string literals, needed to be adapted when converting them. Change-Id: I644ab546d7a0ce9e470ab9b3196e3e60d1e812bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105622 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- extensions/source/abpilot/admininvokationimpl.cxx | 2 +- extensions/source/abpilot/datasourcehandling.cxx | 2 +- extensions/source/dbpilots/controlwizard.cxx | 2 +- extensions/source/logging/csvformatter.cxx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'extensions/source') diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 947f3886232b..fe208e85b3ec 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -61,7 +61,7 @@ namespace abp try { // the service name of the administration dialog - static const char s_sAdministrationServiceName[] = "com.sun.star.sdb.DatasourceAdministrationDialog"; + static const char16_t s_sAdministrationServiceName[] = u"com.sun.star.sdb.DatasourceAdministrationDialog"; static const char s_sDataSourceTypeChangeDialog[] = "com.sun.star.sdb.DataSourceTypeChangeDialog"; // the parameters for the call diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index aa8bba0b33fd..73795a3939ad 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -535,7 +535,7 @@ namespace abp if (!xInteractions.is()) { if ( _pMessageParent ) - ShowServiceNotAvailableError( _pMessageParent, "com.sun.star.task.InteractionHandler", true ); + ShowServiceNotAvailableError( _pMessageParent, u"com.sun.star.task.InteractionHandler", true ); return false; } diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 24bcf10ec7a6..b442aca3fdbe 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -436,7 +436,7 @@ namespace dbp catch(const Exception&) { } if (!xHandler.is()) { - ShowServiceNotAvailableError(_pWindow, "com.sun.star.task.InteractionHandler", true); + ShowServiceNotAvailableError(_pWindow, u"com.sun.star.task.InteractionHandler", true); } return xHandler; } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 57f4d3cf0545..0d0ec6479c5e 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -90,9 +90,9 @@ namespace const sal_Unicode comma_char = ','; constexpr OUStringLiteral dos_newline = u"\r\n"; - bool needsQuoting(const OUString& str) + bool needsQuoting(std::u16string_view str) { - return std::u16string_view(str).find_first_of(u"\",\n\r") != std::u16string_view::npos; + return str.find_first_of(u"\",\n\r") != std::u16string_view::npos; }; void appendEncodedString(OUStringBuffer& buf, const OUString& str) -- cgit