diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-27 10:50:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-11-27 12:59:27 +0100 |
| commit | 1298a6ae9ac2e3cbe4f387a70a47c7fcf491a773 (patch) | |
| tree | 802434ba7d9d22f3b42d7e24722a827f787f94cb /package | |
| parent | 60bff7546fb8e35e5b0cebdeb767a41a6398f828 (diff) | |
Fix typo
...in 2132da5066143d7828984bc1aa42d10223bc5824 "loplugin:stringliteraldefine in
package", which caused CppunitTest_xmlsecurity_signing to fail with
> [_RUN_____] testODFEncryptedGPG::TestBody
> librdf error ¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾ - XML parser error - Document is empty
> warn:sw:113776:113776:sw/source/filter/xml/swxml.cxx:214: SAX parse exception caught while importing: com.sun.star.xml.sax.SAXParseException message: [ line 1]: Document is empty
> ~/lo/core/sax/source/fastparser/fastparser.cxx:609
> wrapped: void message: /home/sbergman/lo/core/tools/source/debug/debug.cxx:104 PublicId: SystemId: LineNumber: 1 ColumnNumber: 1
> warn:sw:113776:113776:sw/source/filter/xml/swxml.cxx:214: SAX parse exception caught while importing: com.sun.star.xml.sax.SAXParseException message: [ line 1]: Document is empty
> /home/sbergman/lo/core/sax/source/fastparser/fastparser.cxx:609
> wrapped: void message: /home/sbergman/lo/core/tools/source/debug/debug.cxx:104 PublicId: SystemId: LineNumber: 1 ColumnNumber: 1
> warn:sw:113776:113776:sw/source/filter/xml/swxml.cxx:214: SAX parse exception caught while importing: com.sun.star.xml.sax.SAXParseException message: [ line 1]: Document is empty
> /home/sbergman/lo/core/sax/source/fastparser/fastparser.cxx:609
> wrapped: void message: /home/sbergman/lo/core/tools/source/debug/debug.cxx:104 PublicId: SystemId: LineNumber: 1 ColumnNumber: 1
> warn:sfx.view:113776:113776:sfx2/source/view/frmload.cxx:489: DBG_UNHANDLED_EXCEPTION in impl_handleCaughtError_nothrow exception: com.sun.star.task.ErrorCodeIOException message: SfxBaseModel::handleLoadError: 0x0x11b /home/sbergman/lo/core/sfx2/source/doc/sfxbasemodel.cxx:2787 errcode: 283
> warn:fwk.loadenv:113776:113776:framework/source/loadenv/loadenv.cxx:202: caught LoadEnvException 6 "interaction request", com.sun.star.task.ErrorCodeRequest "/home/sbergman/lo/core/sfx2/source/doc/objmisc.cxx:1698" while loading <file:///home/sbergman/lo/core//xmlsecurity/qa/unit/signing/data/encryptedGPG.odt>
> /home/sbergman/lo/core/unotest/source/cpp/macros_test.cxx:67:testODFEncryptedGPG::TestBody
> assertion failed
> - Expression: xComponent.is()
> - loading failed: file:///home/sbergman/lo/core//xmlsecurity/qa/unit/signing/data/encryptedGPG.odt
for me
Change-Id: I0326d5ab33a9cfe9c23aab4120b49f37548aea39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125936
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 1d9392d9b8e8..f02629543cf4 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -409,7 +409,7 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName ) aSequence.clear(); } - else if ( (aConvertedName == ELEMENT_ENCRYPTIONMETHOD + else if ( (aConvertedName == ELEMENT_ENCRYPTEDKEY || aConvertedName == ELEMENT_ENCRYPTEDKEY13) && aStack.back().m_bValid ) { if ( !bIgnoreEncryptData ) |