1 files changed, 11 insertions, 1 deletions
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index d41214e4be93..a3fa87ae4e41 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -290,7 +290,17 @@ void XSecController::setPropertyId( OUString& ouPropertyId )
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
-    isi.signatureInfor.ouPropertyId = ouPropertyId;
+
+    if (isi.signatureInfor.ouPropertyId.isEmpty())
+    {
+        // <SignatureProperty> ID attribute is for the date.
+        isi.signatureInfor.ouPropertyId = ouPropertyId;
+    }
+    else
+    {
+        // <SignatureProperty> ID attribute is for the description.
+        isi.signatureInfor.ouDescriptionPropertyId = ouPropertyId;
+    }
 }
 
 /* public: for signature verify */