summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-02-24 14:34:56 +0100
committerEike Rathke <erack@redhat.com>2018-02-24 21:02:41 +0100
commitc6eb3bf58c9c236dc7fe47fb9c4df7dd2a98c2d0 (patch)
tree9e690320487e775639e01c12af0c67a6246613d4
parentd841f348b94f30cb8e94a0d34e9b20aa34d33aca (diff)
Check also ScOoxPasswordHash::verifyPassword(), tdf#104250 prep
Change-Id: Idf1ec7a4b7cde674891df05aae369c403c028fee
-rw-r--r--sc/source/core/data/tabprotection.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 2dec79100484..b0732aa23dc0 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -362,6 +362,11 @@ bool ScTableProtectionImpl::verifyPassword(const OUString& aPassText) const
return aHash2 == maPassHash;
}
+ // Not yet generated or tracked with meHash1 or meHash2, but can be read
+ // from OOXML.
+ if (maPasswordHash.verifyPassword( aPassText))
+ return true;
+
return false;
}