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

[Samuel Mehrbrodt]

 xmlsecurity/inc/certificateviewer.hxx            |    2 ++
 xmlsecurity/source/dialogs/certificateviewer.cxx |   16 ++++++++++++++--
 xmlsecurity/uiconfig/ui/certgeneral.ui           |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 47596612d10cf83c82fc0e58576917ac1537cf88
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Mar 15 09:52:53 2017 +0100

    gpg4libre: Show "issued to/by" only if they contain a value
    
    Change-Id: If815c09fc6701682d6ee3e1feaf3c45ff09646aa
    Reviewed-on: https://gerrit.libreoffice.org/35209
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index 20eb6e9..b287207 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -77,7 +77,9 @@ class CertificateViewerGeneralTP : public CertificateViewerTP
 private:
     VclPtr<FixedImage>         m_pCertImg;
     VclPtr<FixedText>          m_pHintNotTrustedFI;
+    VclPtr<FixedText>          m_pIssuedToLabelFT;
     VclPtr<FixedText>          m_pIssuedToFI;
+    VclPtr<FixedText>          m_pIssuedByLabelFT;
     VclPtr<FixedText>          m_pIssuedByFI;
     VclPtr<FixedText>          m_pValidFromDateFI;
     VclPtr<FixedText>          m_pValidToDateFI;
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index ebe8712..a2dfa81 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -98,7 +98,9 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
 {
     get( m_pCertImg, "certimage" );
     get( m_pHintNotTrustedFI, "hintnotrust" );
+    get( m_pIssuedToLabelFT, "issued_to" );
     get( m_pIssuedToFI, "issued_to_value" );
+    get( m_pIssuedByLabelFT, "issued_by");
     get( m_pIssuedByFI, "issued_by_value" );
     get( m_pValidFromDateFI, "valid_from_value" );
     get( m_pValidToDateFI, "valid_to_value" );
@@ -120,8 +122,16 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
     // insert data
     css::uno::Reference< css::security::XCertificate > xCert = mpDlg->mxCert;
 
-    m_pIssuedToFI->SetText( XmlSec::GetContentPart( xCert->getSubjectName() ) );
-    m_pIssuedByFI->SetText( XmlSec::GetContentPart( xCert->getIssuerName() ) );
+    OUString sSubjectName(XmlSec::GetContentPart(xCert->getSubjectName()));
+    if (!sSubjectName.isEmpty())
+        m_pIssuedToFI->SetText(sSubjectName);
+    else
+        m_pIssuedToLabelFT->Hide();
+    OUString sIssuerName(XmlSec::GetContentPart(xCert->getIssuerName()));
+    if (!sIssuerName.isEmpty())
+        m_pIssuedByFI->SetText(sIssuerName);
+    else
+        m_pIssuedByLabelFT->Hide();
 
     DateTime aDateTimeStart( DateTime::EMPTY );
     DateTime aDateTimeEnd( DateTime::EMPTY );
@@ -158,7 +168,9 @@ void CertificateViewerGeneralTP::dispose()
 {
     m_pCertImg.clear();
     m_pHintNotTrustedFI.clear();
+    m_pIssuedToLabelFT.clear();
     m_pIssuedToFI.clear();
+    m_pIssuedByLabelFT.clear();
     m_pIssuedByFI.clear();
     m_pValidFromDateFI.clear();
     m_pValidToDateFI.clear();
diff --git a/xmlsecurity/uiconfig/ui/certgeneral.ui b/xmlsecurity/uiconfig/ui/certgeneral.ui
index 4ec69e2..3bf3792 100644
--- a/xmlsecurity/uiconfig/ui/certgeneral.ui
+++ b/xmlsecurity/uiconfig/ui/certgeneral.ui
@@ -96,7 +96,7 @@
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label3">
+          <object class="GtkLabel" id="issued_to">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>