diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-26 10:40:24 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-26 23:09:20 +0100 |
| commit | 9c95415de877af1430ab5b7123e11dedd0ea622c (patch) | |
| tree | 0a4bad23e32235523c9164a6094c0edea7f03f25 /include/comphelper | |
| parent | a23a7eea5cfcdc50d09be248828cb1e6293e5ebb (diff) | |
Let comphelper::Base64::decode* take std::u16string_view
Change-Id: I5b04f7adf11c61f52b7bfb0f52c8c075f838f0f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127480
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/base64.hxx | 5 | ||||
| -rw-r--r-- | include/comphelper/docpasswordhelper.hxx | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx index a77ac4ebe3b2..ed32b2f8bc0e 100644 --- a/include/comphelper/base64.hxx +++ b/include/comphelper/base64.hxx @@ -46,9 +46,10 @@ public: // return any chars left from conversion. // For text submitted through the SAX characters call, the later method // must be used! - static void decode(css::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer); + static void decode(css::uno::Sequence<sal_Int8>& aPass, std::u16string_view sBuffer); - static sal_Int32 decodeSomeChars(css::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer); + static sal_Int32 decodeSomeChars(css::uno::Sequence<sal_Int8>& aPass, + std::u16string_view sBuffer); }; } diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index fc40739184bc..dc78110519dd 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -223,7 +223,7 @@ public: */ static css::uno::Sequence<sal_Int8> GetOoxHashAsSequence( const OUString& rPassword, - const OUString& rSaltValue, + std::u16string_view rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, std::u16string_view rAlgorithmName); @@ -269,7 +269,7 @@ public: */ static OUString GetOoxHashAsBase64( const OUString& rPassword, - const OUString& rSaltValue, + std::u16string_view rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, std::u16string_view rAlgorithmName); |