diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-07-19 15:28:45 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-07 23:28:36 +0200 |
| commit | decdd8a8fb5524cb1cc1837e8566812e8039e73d (patch) | |
| tree | 929bfe1bc82d13160fe46130f6dec8aa26488590 /xmlsecurity/CppunitTest_xmlsecurity_signing.mk | |
| parent | b9a0dc13a02e71dc680ad6b3d1d9f55ae27e3217 (diff) | |
tdf#42316 preserve macro signature of templates
When comparing the filter of the current and the target document
we have to strip the '_template' from the filter name.
Still this won't preserve the signature of the document attached
to tdf#42316, as this is a ODF 1.0 OTT, which doesn't have a
valid signature in ODF 1.2, as the signature doesn't match the ODF
1.2 namespace for signatures and the default LO ODF version is ODF
1.2 extended.
In theory the signature itself could even be converted most times,
but that can be done in an additional patch, if needed.
Since the code literally saves a template to an internal document,
SfxObjectShell::DoSaveCompleted must keep the signature of the
template. Eventually it'll be dropped on save of the template as
a document later.
The signing tests check "OTT 1.0 => ODT 1.0: preserve", "OTT 1.2
=> ODT 1.2: preserve" and "OTT 1.0 => ODT 1.2: drop".
Change-Id: I2263093687f5a0568ea781ce3ac9b114c9599add
Reviewed-on: https://gerrit.libreoffice.org/75958
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit c3a1c83ff5af05d34f433ac808adbe85f47e8c18)
Reviewed-on: https://gerrit.libreoffice.org/77112
Diffstat (limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk')
| -rw-r--r-- | xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index 418aa21a27c9..84e7a76c043b 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -60,4 +60,8 @@ $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ LIBO_LD_PATH=$$LD_LIBRARY_PATH endif +$(eval $(call gb_CppunitTest_use_custom_headers,xmlsecurity_signing,\ + officecfg/registry \ +)) + # vim: set noet sw=4 ts=4: |