From 1a04b1e4f2086bfdeaba04d7b67e8b8e21e5037f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 7 Mar 2016 12:09:44 +0100
Subject: [PATCH] xmlsecurity OOXML export: remove signature content types when
 removing ...

... signatures.

ExportSignatureContentTypes() was already a "remove all, and then re-add
necessary entries" operation, so just make sure we still call it for
zero signatures and it'll do the right thing.

Change-Id: If9182b39ac6d8f2cf66f33a02d9ddcab170ba5ea
---
 xmlsecurity/source/helper/documentsignaturemanager.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 505554e89e1f..47d416ffa8b5 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -374,11 +374,9 @@ void DocumentSignatureManager::write()
     {
         // OOXML
         size_t nSignatureCount = maCurrentSignatureInformations.size();
+        maSignatureHelper.ExportSignatureContentTypes(mxStore, nSignatureCount);
         if (nSignatureCount > 0)
-        {
-            maSignatureHelper.ExportSignatureContentTypes(mxStore, nSignatureCount);
             maSignatureHelper.ExportSignatureRelations(aStreamHelper.xSignatureStorage, nSignatureCount);
-        }
         else
         {
             // Removing all signatures: then need to remove the signature relation as well.