summaryrefslogtreecommitdiff
path: root/include/comphelper/docpasswordhelper.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /include/comphelper/docpasswordhelper.hxx
parent0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (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/comphelper/docpasswordhelper.hxx')
-rw-r--r--include/comphelper/docpasswordhelper.hxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index fc98fd3ff34d..bf36cb9250aa 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
#include <comphelper/comphelperdllapi.h>
+#include <string_view>
#include <vector>
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/hash.hxx>
@@ -110,7 +111,7 @@ public:
*/
static css::uno::Sequence< css::beans::PropertyValue >
- GenerateNewModifyPasswordInfo( const OUString& aPassword );
+ GenerateNewModifyPasswordInfo( std::u16string_view aPassword );
/** This helper function allows to check whether
@@ -128,7 +129,7 @@ public:
*/
static bool IsModifyPasswordCorrect(
- const OUString& aPassword,
+ std::u16string_view aPassword,
const css::uno::Sequence< css::beans::PropertyValue >& aInfo );
@@ -162,7 +163,7 @@ public:
*/
static sal_uInt16 GetXLHashAsUINT16(
- const OUString& aString,
+ std::u16string_view aString,
rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
@@ -178,7 +179,7 @@ public:
*/
static css::uno::Sequence< sal_Int8 > GetXLHashAsSequence(
- const OUString& aString );
+ std::u16string_view aString );
/** Convenience function to calculate a salted hash with iterations as