[Libreoffice-commits] core.git: 2 commits - xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/source/helper/documentsignaturehelper.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1e52ec3951f3e9d687bdff20a6378cb2f4819a90
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 12 11:17:29 2016 +0100

    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

diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 2262e06..9c14715 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -93,6 +93,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"))
         {
commit 35ed9089373b4b63ecc656bd4dd57fc6f128c622
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 12 11:10:24 2016 +0100

    xmlsecurity: fix typo in DocumentSignatureHelper::AppendContentTypes()
    
    Change-Id: I5c67db0369d5eb24178e7173ac716dd8e96dfd47

diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 46b270e..2262e06 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -333,7 +333,7 @@ void DocumentSignatureHelper::AppendContentTypes(const uno::Reference<embed::XSt
             return rElement.endsWith("." + rPair.First);
         });
 
-        if (it != rOverrides.end())
+        if (it != rDefaults.end())
         {
             rElement = "/" + rElement + "?ContentType=" + it->Second;
             continue;