diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-22 14:08:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-27 11:26:32 +0100 |
| commit | 9013dc1650aa8400f63da5f584df9058b1740eb3 (patch) | |
| tree | a1ba4f196070459d5d823d942e5a0a121b09ea3d /sc | |
| parent | db97e00893c204226a2eab2d95c9837bce3cddb0 (diff) | |
Simplify loplugin:stringviewparam comparison operator handling
In practice, it works fine to look at all of them, regardless of actual argument
types.
Change-Id: Ifc49cbcd6003c8837c1b3f81d432c59fb0657bf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108366
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7cb7cbf30b63..f68cc4a62a1a 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -145,8 +145,8 @@ const char pFilterXML[] = "StarOffice XML (Calc)"; const OUStringLiteral pFilterAscii = u"" SC_TEXT_CSV_FILTER_NAME; const OUStringLiteral pFilterLotus = u"Lotus"; const char pFilterQPro6[] = "Quattro Pro 6.0"; -const char pFilterExcel4[] = "MS Excel 4.0"; -const char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; +const char16_t pFilterExcel4[] = u"MS Excel 4.0"; +const char16_t pFilterEx4Temp[] = u"MS Excel 4.0 Vorlage/Template"; const char pFilterExcel5[] = "MS Excel 5.0/95"; const char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; const char pFilterExcel95[] = "MS Excel 95"; @@ -155,10 +155,10 @@ const char pFilterExcel97[] = "MS Excel 97"; const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; const OUStringLiteral pFilterDBase = u"dBase"; const OUStringLiteral pFilterDif = u"DIF"; -const char pFilterSylk[] = "SYLK"; +const char16_t pFilterSylk[] = u"SYLK"; const OUStringLiteral pFilterHtml = u"HTML (StarCalc)"; const OUStringLiteral pFilterHtmlWebQ = u"calc_HTML_WebQuery"; -const char pFilterRtf[] = "Rich Text Format (StarCalc)"; +const char16_t pFilterRtf[] = u"Rich Text Format (StarCalc)"; #define ShellClass_ScDocShell #include <scslots.hxx> @@ -2710,7 +2710,7 @@ OUString ScDocShell::GetDifFilterName() return pFilterDif; } -bool ScDocShell::HasAutomaticTableName( const OUString& rFilter ) +bool ScDocShell::HasAutomaticTableName( std::u16string_view rFilter ) { // sal_True for those filters that keep the default table name // (which is language specific) diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 849b05f95def..6682979adc7d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -34,6 +34,7 @@ #include <docuno.hxx> #include <memory> +#include <string_view> #include <unordered_map> #include <map> @@ -397,7 +398,7 @@ public: static OUString GetLotusFilterName(); static OUString GetDBaseFilterName(); static OUString GetDifFilterName(); - static bool HasAutomaticTableName( const OUString& rFilter ); + static bool HasAutomaticTableName( std::u16string_view rFilter ); static void LOKCommentNotify(LOKCommentNotificationType nType, const ScDocument* pDocument, const ScAddress& rPos, const ScPostIt* pNote); DECL_LINK( RefreshDBDataHdl, Timer*, void ); |