diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
| commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
| tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /include/svtools | |
| parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/HtmlWriter.hxx | 3 | ||||
| -rw-r--r-- | include/svtools/ctrltool.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/htmlout.hxx | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx index 58b0861e9fb4..d6e0294cafce 100644 --- a/include/svtools/HtmlWriter.hxx +++ b/include/svtools/HtmlWriter.hxx @@ -12,6 +12,7 @@ #include <rtl/string.hxx> #include <rtl/ustring.hxx> +#include <string_view> #include <vector> #include <svtools/svtdllapi.h> @@ -45,7 +46,7 @@ public: void attribute(const OString& aAttribute, const char* aValue); void attribute(const OString& aAttribute, sal_Int32 aValue); void attribute(const OString& aAttribute, const OString& aValue); - void attribute(const OString& aAttribute, const OUString& aValue); + void attribute(const OString& aAttribute, std::u16string_view aValue); // boolean attribute e.g. <img ismap> void attribute(const OString& aAttribute); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 0bd75f0aefe0..3b622dc6ef97 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -28,7 +28,7 @@ #include <vector> #include <memory> - +#include <string_view> class ImplFontListNameInfo; class OutputDevice; @@ -205,7 +205,7 @@ public: sal_Int32 Count() const { return mnElem; } bool IsEmpty() const { return !mnElem; } - sal_Int32 Name2Size( const OUString& ) const; + sal_Int32 Name2Size( std::u16string_view ) const; OUString Size2Name( sal_Int32 ) const; OUString GetIndexName( sal_Int32 nIndex ) const; diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 760cc2b3c90b..a3b3c36bd217 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -19,6 +19,10 @@ #pragma once +#include <sal/config.h> + +#include <string_view> + #include <svtools/svtdllapi.h> #include <tools/solar.h> #include <rtl/textenc.h> @@ -76,7 +80,7 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm, const OUString& rBaseURL, - const OUString& rSource, + std::u16string_view rSource, const OUString& rLanguage, ScriptType eScriptType, const OUString& rSrc, |