[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - comphelper/source
Thorsten Behrens (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 8 14:53:25 UTC 2020
comphelper/source/misc/docpasswordhelper.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 07b67feb9c8487e41f17c16e5d31d640c3630156
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: Mon Jun 8 16:52:44 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 660ce8aea89c..2b52c1400f60 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -451,11 +451,11 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
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
More information about the Libreoffice-commits
mailing list