From af16aa625682b649e8843237652b9246d519cbae Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 13 May 2021 11:57:17 +0200 Subject: Improve loplugin:stringview Issue the "instead of O[U]String, pass [u16]string_view" diagnostic also for operator call arguments. (The "rather than copy, pass subView()" diagnostic is already part of handleSubExprThatCouldBeView, so no need to repeat it explicitly for operator call arguments.) (And many call sites don't even require an explicit [u16]string_view, esp. with the recent ad48b2b02f83eed41fb1eb8d16de7e804156fcf1 "Optimized OString operator += overloads". Just some test code in sal/qa/ that explicitly tests the O[U]String functionality had to be excluded.) Change-Id: I8d55ba5a7fa16a563f5ffe43d245125c88c793bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115589 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- hwpfilter/source/hwpreader.cxx | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'hwpfilter') diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 7bc22fa370c7..06e26f8522c8 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "hwpreader.hxx" #include @@ -3152,25 +3153,26 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox) /* Document Summary */ else if( hbox->type[0] == 3 && hbox->type[1] == 0 ) { - if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "title") + if (reinterpret_cast(hconv(hbox->str3.get())) + == std::u16string_view(u"title")) { rstartEl( "text:title", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:title" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "subject") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"subject")) { rstartEl( "text:subject", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:subject" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "author") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"author")) { rstartEl( "text:author-name", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:author-name" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "keywords") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"keywords")) { rstartEl( "text:keywords", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); @@ -3180,61 +3182,63 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox) /* Personal Information */ else if( hbox->type[0] == 3 && hbox->type[1] == 1 ) { - if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "User") + if (reinterpret_cast(hconv(hbox->str3.get())) + == std::u16string_view(u"User")) { rstartEl( "text:sender-lastname", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-lastname" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Company") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Company")) { rstartEl( "text:sender-company", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-company" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Position") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Position")) { rstartEl( "text:sender-title", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-title" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Division") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Division")) { rstartEl( "text:sender-position", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-position" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Fax") + else if (reinterpret_cast(hconv(hbox->str3.get())) + == std::u16string_view(u"Fax")) { rstartEl( "text:sender-fax", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-fax" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Pager") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Pager")) { rstartEl( "text:phone-private", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:phone-private" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "E-mail") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"E-mail")) { rstartEl( "text:sender-email", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-email" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Zipcode(office)") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Zipcode(office)")) { rstartEl( "text:sender-postal-code", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-postal-code" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Phone(office)") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Phone(office)")) { rstartEl( "text:sender-phone-work", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); rendEl( "text:sender-phone-work" ); } - else if (OUString(reinterpret_cast(hconv(hbox->str3.get()))) == "Address(office)") + else if (reinterpret_cast(hconv(hbox->str3.get())) == std::u16string_view(u"Address(office)")) { rstartEl( "text:sender-street", mxList ); rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) ); -- cgit v1.2.3