diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-15 09:52:53 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-15 09:58:31 +0000 |
| commit | 47596612d10cf83c82fc0e58576917ac1537cf88 (patch) | |
| tree | 2a9a197a1afffa6c07584eea173a572500e6a4ff /xmlsecurity | |
| parent | 1238cd22c4e2e801eab612d667038e0173b4dccd (diff) | |
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@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/certificateviewer.hxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 16 | ||||
| -rw-r--r-- | xmlsecurity/uiconfig/ui/certgeneral.ui | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index 20eb6e946004..b2872075a830 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 ebe8712c3ce5..a2dfa814cefd 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 4ec69e21b135..3bf3792a54de 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> |