package/source/zippackage/ZipPackage.cxx | 5 ----- 1 file changed, 5 deletions(-)
New commits: commit 62aa393f5bd497512384e45e6aa550bcf7e65793 Author: Vasily Melenchuk <[email protected]> AuthorDate: Mon Nov 18 11:26:23 2019 +0300 Commit: Vasily Melenchuk <[email protected]> CommitDate: Mon Nov 18 11:26:23 2019 +0300 package: ignore unknown encryption parameters. Do not throw an exception if there are encryption parameters, but they are not supported in current output format. Change-Id: I21e4cf2f73d7c218ab5444b2016e838695163ca3 diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 63178c7fec24..4715298b4bfb 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1642,11 +1642,6 @@ uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey() for ( const auto& rKey : std::as_const(m_aStorageEncryptionKeys) ) if ( rKey.Name == aNameToFind ) rKey.Value >>= aResult; - - // empty keys are not allowed here - // so it is not important whether there is no key, or the key is empty, it is an error - if ( !aResult.hasElements() ) - throw uno::RuntimeException(THROW_WHERE "No expected key is provided!" ); } else aResult = m_aEncryptionKey; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
