diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-12 11:17:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 12:28:34 +0200 |
| commit | 4419a09e263c9990d5adeece360b6701d5964a8b (patch) | |
| tree | 0bc9820a4668fa3c679e559f0366e561a6f2208a /xmlsecurity | |
| parent | 5bb03c950db724eaa11acbf1113b874e5d182567 (diff) | |
xmlsecurity OOXML export: never sign [Content_Types].xml
With this, our own import is happy when we sign LO-generated OOXML
files.
Change-Id: I977d7db5cf18fec1f33c480ab6e58852f2433923
(cherry picked from commit 1e52ec3951f3e9d687bdff20a6378cb2f4819a90)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/helper/documentsignaturehelper.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 821015900ade..41a805abbacb 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -94,6 +94,10 @@ void ImplFillElementList( for ( sal_Int32 n = 0; n < nElements; n++ ) { + if (pNames[n] == "[Content_Types].xml") + // OOXML + continue; + if (mode != OOo3_2Document && (pNames[n] == "META-INF" || pNames[n] == "mimetype")) { |