[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - comphelper/source

[Thorsten Behrens (via logerrit)]

 comphelper/source/misc/docpasswordhelper.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d62c472085a5a0be07d98beb564a0cf21faebfb
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Thu Mar 12 11:01:55 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu May 28 14:18:04 2020 +0200

    comphelper: fix build against CentOS6 baseline
    
    Change-Id: Ice8a27dc92c923b3d2c62a6989e13720ff044749
    (cherry picked from commit 25e7d4a47171ec68202269a8f94fae002b7715c9)

diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index d888a352858d..326535f1ddbf 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -523,11 +523,11 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 
     if (eResult == DocPasswordVerifierResult::OK && !aPassword.isEmpty())
     {
-        if (std::find_if(std::cbegin(aEncData), std::cend(aEncData),
+        if (std::find_if(aEncData.begin(), aEncData.end(),
                          [](const css::beans::NamedValue& val) {
                              return val.Name == PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
                          })
-            == std::cend(aEncData))
+            == aEncData.end())
         {
             // tdf#118639: We need ODF encryption data for autorecovery, where password
             // will already be unavailable, so generate and append it here