From 9c5d3e5c59a9d0ffcb5fd99f5d4c98b0f6b5560e Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Date: Fri, 9 Nov 2018 16:42:16 +0100
Subject: tdf#118581 Correctly display issuer name in signature line

Move the xmlsec helper methods to comphelper so that we can use them in cui

Change-Id: If9b10cfff5f5abd6b16e48f043af7959edbb1142
Reviewed-on: https://gerrit.libreoffice.org/63198
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
---
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx')

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 926b74371faa..d7ea836e2e71 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -48,14 +48,17 @@
 
 #include <tools/date.hxx>
 #include <tools/time.hxx>
+#include <unotools/datetime.hxx>
 #include <vcl/treelistentry.hxx>
 
 #include <strings.hrc>
 #include <resourcemanager.hxx>
+#include <comphelper/xmlsechelper.hxx>
 
 #include <vcl/weld.hxx>
 #include <unotools/configitem.hxx>
 
+using namespace comphelper;
 using namespace css::security;
 using namespace css::uno;
 using namespace css;
@@ -587,8 +590,8 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                     bCertValid = false;
                 }
 
-                aSubject = XmlSec::GetContentPart( xCert->getSubjectName() );
-                aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() );
+                aSubject = xmlsec::GetContentPart( xCert->getSubjectName() );
+                aIssuer = xmlsec::GetContentPart( xCert->getIssuerName() );
             }
             else if (!rInfo.ouGpgCertificate.isEmpty())
             {
@@ -596,7 +599,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                 aIssuer = rInfo.ouGpgOwner;
             }
 
-            aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
+            aDateTimeStr = utl::GetDateTimeString( rInfo.stDateTime );
             aDescription = rInfo.ouDescription;
 
             // Decide type string.
-- 
cgit