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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/source/regimpl.cxx | 2 | ||||
| -rw-r--r-- | registry/source/regimpl.hxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 27a4592c9dc2..dc87985ab623 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -1005,7 +1005,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } RegError ORegistry::checkBlop(OStoreStream& rValue, - const OUString& sTargetPath, + std::u16string_view sTargetPath, sal_uInt32 srcValueSize, sal_uInt8 const * pSrcBuffer, bool bReport) diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index e049cf147c18..db2af7e77846 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX #define INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX +#include <sal/config.h> + +#include <string_view> #include <unordered_map> #include <regapi.hxx> @@ -111,7 +114,7 @@ private: bool bReport); static RegError checkBlop(store::OStoreStream& rValue, - const OUString& sTargetPath, + std::u16string_view sTargetPath, sal_uInt32 srcValueSize, sal_uInt8 const * pSrcBuffer, bool bReport); |