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

[Samuel Mehrbrodt]

 xmlsecurity/inc/certificateviewer.hxx            |   12 +++----
 xmlsecurity/source/dialogs/certificateviewer.cxx |   36 +++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit c1800a7b428c285675ab0b20abe3a2948a56d9d2
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Mar 15 11:03:21 2017 +0100

    Fix variable names: FixedText, not FixedImage
    
    Change-Id: I5e87305e3d4ada4b7595ab8aac55b42bc091e031
    Reviewed-on: https://gerrit.libreoffice.org/35211
    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 76174cc..cd30915 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -76,15 +76,15 @@ class CertificateViewerGeneralTP : public CertificateViewerTP
 {
 private:
     VclPtr<FixedImage>         m_pCertImg;
-    VclPtr<FixedText>          m_pHintNotTrustedFI;
+    VclPtr<FixedText>          m_pHintNotTrustedFT;
     VclPtr<FixedText>          m_pIssuedToLabelFT;
-    VclPtr<FixedText>          m_pIssuedToFI;
+    VclPtr<FixedText>          m_pIssuedToFT;
     VclPtr<FixedText>          m_pIssuedByLabelFT;
-    VclPtr<FixedText>          m_pIssuedByFI;
-    VclPtr<FixedText>          m_pValidFromDateFI;
-    VclPtr<FixedText>          m_pValidToDateFI;
+    VclPtr<FixedText>          m_pIssuedByFT;
+    VclPtr<FixedText>          m_pValidFromDateFT;
+    VclPtr<FixedText>          m_pValidToDateFT;
     VclPtr<FixedImage>         m_pKeyImg;
-    VclPtr<FixedText>          m_pHintCorrespPrivKeyFI;
+    VclPtr<FixedText>          m_pHintCorrespPrivKeyFT;
 public:
                         CertificateViewerGeneralTP( vcl::Window* pParent, CertificateViewer* _pDlg );
     virtual             ~CertificateViewerGeneralTP() override;
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 7a68d03..57b558c 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -101,15 +101,15 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
     :CertificateViewerTP    ( _pParent, "CertGeneral", "xmlsec/ui/certgeneral.ui", _pDlg )
 {
     get( m_pCertImg, "certimage" );
-    get( m_pHintNotTrustedFI, "hintnotrust" );
+    get( m_pHintNotTrustedFT, "hintnotrust" );
     get( m_pIssuedToLabelFT, "issued_to" );
-    get( m_pIssuedToFI, "issued_to_value" );
+    get( m_pIssuedToFT, "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" );
+    get( m_pIssuedByFT, "issued_by_value" );
+    get( m_pValidFromDateFT, "valid_from_value" );
+    get( m_pValidToDateFT, "valid_to_value" );
     get( m_pKeyImg, "keyimage" );
-    get( m_pHintCorrespPrivKeyFI, "privatekey" );
+    get( m_pHintCorrespPrivKeyFT, "privatekey" );
 
     //Verify the certificate
     sal_Int32 certStatus = mpDlg->mxSecurityEnvironment->verifyCertificate(mpDlg->mxCert,
@@ -120,7 +120,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
     if ( !bCertValid )
     {
         m_pCertImg->SetImage(Image(BitmapEx(XMLSEC_RES(BMP_STATE_NOT_VALIDATED))));
-        m_pHintNotTrustedFI->SetText( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) );
+        m_pHintNotTrustedFT->SetText( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) );
     }
 
     // insert data
@@ -128,12 +128,12 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
 
     OUString sSubjectName(XmlSec::GetContentPart(xCert->getSubjectName()));
     if (!sSubjectName.isEmpty())
-        m_pIssuedToFI->SetText(sSubjectName);
+        m_pIssuedToFT->SetText(sSubjectName);
     else
         m_pIssuedToLabelFT->Hide();
     OUString sIssuerName(XmlSec::GetContentPart(xCert->getIssuerName()));
     if (!sIssuerName.isEmpty())
-        m_pIssuedByFI->SetText(sIssuerName);
+        m_pIssuedByFT->SetText(sIssuerName);
     else
         m_pIssuedByLabelFT->Hide();
 
@@ -145,8 +145,8 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
     OUString sValidFromDate = GetSettings().GetUILocaleDataWrapper().getDate( Date( aDateTimeStart.GetDate()));
     OUString sValidToDate = GetSettings().GetUILocaleDataWrapper().getDate( Date( aDateTimeEnd.GetDate()));
 
-    m_pValidFromDateFI->SetText(sValidFromDate);
-    m_pValidToDateFI->SetText(sValidToDate);
+    m_pValidFromDateFT->SetText(sValidFromDate);
+    m_pValidToDateFT->SetText(sValidToDate);
 
     // Check if we have the private key...
     bool bHasPrivateKey = false;
@@ -159,7 +159,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
     if ( !bHasPrivateKey )
     {
         m_pKeyImg->Hide();
-        m_pHintCorrespPrivKeyFI->Hide();
+        m_pHintCorrespPrivKeyFT->Hide();
     }
 }
 
@@ -171,15 +171,15 @@ CertificateViewerGeneralTP::~CertificateViewerGeneralTP()
 void CertificateViewerGeneralTP::dispose()
 {
     m_pCertImg.clear();
-    m_pHintNotTrustedFI.clear();
+    m_pHintNotTrustedFT.clear();
     m_pIssuedToLabelFT.clear();
-    m_pIssuedToFI.clear();
+    m_pIssuedToFT.clear();
     m_pIssuedByLabelFT.clear();
-    m_pIssuedByFI.clear();
-    m_pValidFromDateFI.clear();
-    m_pValidToDateFI.clear();
+    m_pIssuedByFT.clear();
+    m_pValidFromDateFT.clear();
+    m_pValidToDateFT.clear();
     m_pKeyImg.clear();
-    m_pHintCorrespPrivKeyFI.clear();
+    m_pHintCorrespPrivKeyFT.clear();
     CertificateViewerTP::dispose();
 }