diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-28 18:04:14 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-18 18:19:03 +0200 |
| commit | a541cd91951eca15e40764244b34c72b347f9f26 (patch) | |
| tree | 4bc8d4dae54b42a65bd65239dc5283bcb667b23b /xmlsecurity | |
| parent | 101594c272a53727566b3533fd083178769a4b49 (diff) | |
officecfg,unotools,cui: add ODF 1.2 Extended / ODF 1.3 versions
... to configuration and UI.
The new default is ODF 1.3 Extended, which is now ODFVER_LATEST and
stored as value "3" in configuration.
Adapt a few places related to DocumentDigitalSignatures etc. to new
default.
Change-Id: I420da4f7787cc864c6bd88470d61b146b9399aa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93177
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/source/component/documentdigitalsignatures.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index f47f2c12da33..ed6e55e829d4 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -1076,14 +1076,14 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF) // the loaded document is a OTT with a valid macro signature assertDocument(CPPUNIT_SOURCELINE(), "writer8_template", SignatureState::NOSIGNATURES, - SignatureState::OK, ODFVER_012_TEXT); + SignatureState::OK, ODFVER_013_TEXT); // load saved ODT document createDoc(aTempFileSaveAsODT.GetURL()); // the loaded document is a ODT with a macro signature assertDocument(CPPUNIT_SOURCELINE(), "writer8", SignatureState::NOSIGNATURES, - SignatureState::OK, ODFVER_012_TEXT); + SignatureState::OK, ODFVER_013_TEXT); // save as new OTT template utl::TempFile aTempFileSaveAsODT_OTT; @@ -1110,7 +1110,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF) // the loaded document is a OTT with a valid macro signature assertDocument(CPPUNIT_SOURCELINE(), "writer8_template", SignatureState::NOSIGNATURES, - SignatureState::OK, ODFVER_012_TEXT); + SignatureState::OK, ODFVER_013_TEXT); } /// Test if a macro signature from an OTT 1.0 is dropped for ODT 1.2 @@ -1160,7 +1160,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testDropMacroTemplateSignature) // the loaded document is a 1.2 ODT without any signatures assertDocument(CPPUNIT_SOURCELINE(), "writer8", SignatureState::NOSIGNATURES, - SignatureState::NOSIGNATURES, ODFVER_012_TEXT); + SignatureState::NOSIGNATURES, ODFVER_013_TEXT); // load the template as-is to validate signatures mxComponent->dispose(); @@ -1198,7 +1198,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testDropMacroTemplateSignature) // the loaded document is a 1.2 OTT without any signatures assertDocument(CPPUNIT_SOURCELINE(), "writer8_template", SignatureState::NOSIGNATURES, - SignatureState::NOSIGNATURES, ODFVER_012_TEXT); + SignatureState::NOSIGNATURES, ODFVER_013_TEXT); } namespace diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 9a697d1f15f0..d149bf5e30b2 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -211,7 +211,7 @@ private: DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< XComponentContext >& rxCtx ): mxCtx(rxCtx), - m_sODFVersion(ODFVER_012_TEXT), + m_sODFVersion(ODFVER_013_TEXT), m_nArgumentsCount(0), m_bHasDocumentSignature(false) { |