sc/qa/extras/macros-test.cxx | 6 ++++++ sw/qa/core/macros-test.cxx | 3 +++ test/source/bootstrapfixture.cxx | 2 +- test/source/unoapi_test.cxx | 6 +++--- 4 files changed, 13 insertions(+), 4 deletions(-)
New commits: commit 374e7cd1a48d9f564e50d6036afbb68b7fdf6add Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 30 13:18:26 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jan 30 14:51:36 2026 +0100 resolves tdf#149567: odfvalidator: do not validate password protected files Running "java -jar odfvalidator-0.9.0-jar-with-dependencies.jar test.odt" it fails with ene 30, 2026 1:09:49 P. M. org.odftoolkit.odfdom.pkg.ZipHelper entriesToMap INFORMACIÓN: ZIP ENTRY not found /home/xisco/Descargas/test.odt: Fatal: ZIP entry 'mimetype': only DEFLATED entries can have EXT descriptor /home/xisco/Descargas/test.odt: Fatal: The document is encrypted. Validation of encrypted documents is not supported. /home/xisco/Descargas/test.odt/META-INF/manifest.xml[2,194]: Error: unexpected attribute "manifest:version" /home/xisco/Descargas/test.odt/META-INF/manifest.xml[6,136]: Error: tag name "manifest:start-key-generation" is not allowed. Possible tag names are: <key-derivation> Change-Id: I185e9cd5227a07cd7fd07379c8925b9a8296d0a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198426 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 4eb2b2c90bb7..cac7ad93b542 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -300,6 +300,9 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedUnicodeString) xLC->loadLibrary(sLibName); CPPUNIT_ASSERT(xLC->isLibraryLoaded(sLibName)); + // Password protected documents can't be validated + skipValidation(); + // Now check that saving stores Unicode data correctly in image's string pool saveAndReload(TestFilter::ODS); @@ -340,6 +343,9 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedArrayInUserType) xLC->loadLibrary(sLibName); CPPUNIT_ASSERT(xLC->isLibraryLoaded(sLibName)); + // Password protected documents can't be validated + skipValidation(); + // Now check that saving stores array bounds correctly saveAndReload(TestFilter::ODS); diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index d6c260992de2..51c30ade0012 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -452,6 +452,9 @@ void SwMacrosTest::testFdo87530() xBasLibPwd->changeLibraryPassword(u"BarLibrary"_ustr, u""_ustr, u"foo"_ustr); } + // Password protected documents can't be validated + skipValidation(); + saveAndReload(TestFilter::ODT); { diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 2813cc0e27ea..39f2538ca10b 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -263,7 +263,7 @@ void test::BootstrapFixture::validate(const OUString& rPath, std::u16string_view } else if( eFormat == test::ODF && !aContentOUString.isEmpty() ) { - if( aContentOUString.indexOf("Error") != -1 ) + if( aContentOUString.indexOf("Error") != -1 || aContentOUString.indexOf("Fatal") != -1 ) { SAL_WARN("test", aContentOUString); CPPUNIT_FAIL(aContentString.getStr()); diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index a6630169c40f..008509ca136c 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -173,10 +173,10 @@ void UnoApiTest::save(TestFilter eFilter, const char* pPassword) { u"OOXPassword"_ustr, uno::Any(sPassword) } }; aMediaDescriptor[utl::MediaDescriptor::PROP_ENCRYPTIONDATA] <<= aEncryptionData; - - // validation fails with "zip END header not found" - skipValidation(); } + + // Password protected documents can't be validated + skipValidation(); } saveWithParams(aMediaDescriptor.getAsConstPropertyValueList());
