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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/AdditionsDialog.cxx | 84 |
1 files changed, 48 insertions, 36 deletions
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index 2a00f1f28a0c..832a7314b440 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -7,6 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * */ + +#include <sal/config.h> + +#include <string_view> + #include <config_folders.h> #include <AdditionsDialog.hxx> @@ -142,54 +147,61 @@ void parseResponse(const std::string& rResponse, std::vector<AdditionInfo>& aAdd try { AdditionInfo aNewAddition = { - OStringToOUString(OString(arrayElement.child("id").string_value().get()), - RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("name").string_value().get()), - RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("author").string_value().get()), + OStringToOUString(std::string_view(arrayElement.child("id").string_value().get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("url").string_value().get()), + OStringToOUString(std::string_view(arrayElement.child("name").string_value().get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("screenshotURL").string_value().get()), + OStringToOUString( + std::string_view(arrayElement.child("author").string_value().get()), + RTL_TEXTENCODING_UTF8), + OStringToOUString(std::string_view(arrayElement.child("url").string_value().get()), RTL_TEXTENCODING_UTF8), OStringToOUString( - OString(arrayElement.child("extensionIntroduction").string_value().get()), + std::string_view(arrayElement.child("screenshotURL").string_value().get()), RTL_TEXTENCODING_UTF8), OStringToOUString( - OString(arrayElement.child("extensionDescription").string_value().get()), + std::string_view( + arrayElement.child("extensionIntroduction").string_value().get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("releases") - .child(0) - .child("compatibility") - .string_value() - .get()), - RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("releases") - .child(0) - .child("releaseName") - .string_value() - .get()), - RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("releases") - .child(0) - .child("license") - .string_value() - .get()), - RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("commentNumber").string_value().get()), + OStringToOUString( + std::string_view( + arrayElement.child("extensionDescription").string_value().get()), + RTL_TEXTENCODING_UTF8), + OStringToOUString(std::string_view(arrayElement.child("releases") + .child(0) + .child("compatibility") + .string_value() + .get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("commentURL").string_value().get()), + OStringToOUString(std::string_view(arrayElement.child("releases") + .child(0) + .child("releaseName") + .string_value() + .get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("rating").string_value().get()), + OStringToOUString(std::string_view(arrayElement.child("releases") + .child(0) + .child("license") + .string_value() + .get()), RTL_TEXTENCODING_UTF8), OStringToOUString( - OString(arrayElement.child("downloadNumber").string_value().get()), + std::string_view(arrayElement.child("commentNumber").string_value().get()), + RTL_TEXTENCODING_UTF8), + OStringToOUString( + std::string_view(arrayElement.child("commentURL").string_value().get()), + RTL_TEXTENCODING_UTF8), + OStringToOUString( + std::string_view(arrayElement.child("rating").string_value().get()), + RTL_TEXTENCODING_UTF8), + OStringToOUString( + std::string_view(arrayElement.child("downloadNumber").string_value().get()), RTL_TEXTENCODING_UTF8), - OStringToOUString(OString(arrayElement.child("releases") - .child(0) - .child("downloadURL") - .string_value() - .get()), + OStringToOUString(std::string_view(arrayElement.child("releases") + .child(0) + .child("downloadURL") + .string_value() + .get()), RTL_TEXTENCODING_UTF8) }; |