[Libreoffice-commits] core.git: comphelper/source

[Stephan Bergmann (via logerrit)]

 comphelper/source/misc/docpasswordhelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b453f39b34bfbdd06e9aea5402c8c8006dee829b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 27 17:07:48 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 28 22:59:11 2020 +0200

    Simply use OUString aPassword as-is
    
    ...instead of creating a copy via the OUString(sal_Unicode const *) ctor.  (This
    was introduced with dd198398b6e5c84ab1255a90ef96e6445b66a64f, but for no obvious
    reason.)
    
    Change-Id: I9b46b3b1bb402c11810a4d3e68592cfe6fd8034c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101568
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 4dd9c8312bee..d528d57e5cbf 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -534,7 +534,7 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 
             // 1. Prepare binary MS formats encryption data
             auto aUniqueID = GenerateRandomByteSequence(16);
-            auto aEnc97Key = GenerateStd97Key(aPassword.getStr(), aUniqueID);
+            auto aEnc97Key = GenerateStd97Key(aPassword, aUniqueID);
             // 2. Add MS binary and OOXML encryption data to result
             aEncData = comphelper::concatSequences(
                 aEncData, std::initializer_list<beans::NamedValue>{