1 files changed, 31 insertions, 28 deletions
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index a05d54ab1755..1bf0ffad199b 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -758,43 +758,46 @@ void XSecController::exportSignature(
             }
             else
             {
-                assert(!signatureInfo.X509Datas.empty());
-                for (auto const& it : signatureInfo.X509Datas)
+                assert(signatureInfo.GetSigningCertificate());
+                for (auto const& rData : signatureInfo.X509Datas)
                 {
                     /* Write X509Data element */
                     xDocumentHandler->startElement(
                         "X509Data",
                         css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
                     {
-                        /* Write X509IssuerSerial element */
-                        xDocumentHandler->startElement(
-                            "X509IssuerSerial",
-                            css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
-                        {
-                            /* Write X509IssuerName element */
-                            xDocumentHandler->startElement(
-                                "X509IssuerName",
-                                css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
-                            xDocumentHandler->characters(it.X509IssuerName);
-                            xDocumentHandler->endElement( "X509IssuerName" );
-
-                            /* Write X509SerialNumber element */
-                            xDocumentHandler->startElement(
-                                "X509SerialNumber",
-                                css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
-                            xDocumentHandler->characters(it.X509SerialNumber);
-                            xDocumentHandler->endElement( "X509SerialNumber" );
-                        }
-                        xDocumentHandler->endElement( "X509IssuerSerial" );
-
-                        /* Write X509Certificate element */
-                        if (!it.X509Certificate.isEmpty())
+                        for (auto const& it : rData)
                         {
+                            /* Write X509IssuerSerial element */
                             xDocumentHandler->startElement(
-                                "X509Certificate",
+                                "X509IssuerSerial",
                                 css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
-                            xDocumentHandler->characters(it.X509Certificate);
-                            xDocumentHandler->endElement( "X509Certificate" );
+                            {
+                                /* Write X509IssuerName element */
+                                xDocumentHandler->startElement(
+                                    "X509IssuerName",
+                                    css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
+                                xDocumentHandler->characters(it.X509IssuerName);
+                                xDocumentHandler->endElement( "X509IssuerName" );
+
+                                /* Write X509SerialNumber element */
+                                xDocumentHandler->startElement(
+                                    "X509SerialNumber",
+                                    css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
+                                xDocumentHandler->characters(it.X509SerialNumber);
+                                xDocumentHandler->endElement( "X509SerialNumber" );
+                            }
+                            xDocumentHandler->endElement( "X509IssuerSerial" );
+
+                            /* Write X509Certificate element */
+                            if (!it.X509Certificate.isEmpty())
+                            {
+                                xDocumentHandler->startElement(
+                                    "X509Certificate",
+                                    css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
+                                xDocumentHandler->characters(it.X509Certificate);
+                                xDocumentHandler->endElement( "X509Certificate" );
+                            }
                         }
                     }
                     xDocumentHandler->endElement( "X509Data" );