convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

8 files changed, 18 insertions, 24 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 887338c32818..a9f7bea7e94c 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -46,17 +46,18 @@ private:
     css::uno::Reference< css::uno::XComponentContext > mxCtx;
     css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
     css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts;
-    SignatureInformations maCertsToIgnore;
+    SignatureInformations   maCertsToIgnore;
 
-    VclPtr<SvSimpleTable>     m_pCertLB;
-    VclPtr<PushButton>         m_pViewBtn;
-    VclPtr<OKButton>           m_pOKBtn;
+    VclPtr<SvSimpleTable>   m_pCertLB;
+    VclPtr<PushButton>      m_pViewBtn;
+    VclPtr<OKButton>        m_pOKBtn;
 
-    bool                mbInitialized;
+    bool                    mbInitialized;
 
     sal_uInt16              GetSelectedEntryPos() const;
+
     DECL_LINK_TYPED(ViewButtonHdl, Button*, void);
-    DECL_LINK(          CertificateHighlightHdl, void* );
+    DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void );
     DECL_LINK(          CertificateSelectHdl, void* );
 
     void ImplShowCertificateDetails();
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index b3b6de53ece5..53499cd875b7 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -102,7 +102,7 @@ private:
     vcl::Font               m_aStdFont;
     vcl::Font               m_aFixedWidthFont;
 
-    DECL_LINK(          ElementSelectHdl, void* );
+    DECL_LINK_TYPED(    ElementSelectHdl, SvTreeListBox*, void );
     void                Clear();
     void                InsertElement( const OUString& _rField, const OUString& _rValue,
                                        const OUString& _rDetails, bool _bFixedWidthFont = false );
@@ -130,9 +130,9 @@ private:
     OUString            msCertNotValidated;
 
     DECL_LINK_TYPED(    ViewCertHdl, Button*, void );
-    DECL_LINK(          CertSelectHdl, void* );
+    DECL_LINK_TYPED(    CertSelectHdl, SvTreeListBox*, void );
     void                Clear();
-    SvTreeListEntry*        InsertCert( SvTreeListEntry* _pParent, const OUString& _rName,
+    SvTreeListEntry*    InsertCert( SvTreeListEntry* _pParent, const OUString& _rName,
                                     css::uno::Reference< css::security::XCertificate > rxCert,
                                     bool bValid);
 
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 843d450f9cb4..b56ddef455a2 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -91,10 +91,10 @@ private:
     DECL_LINK_TYPED(ViewButtonHdl, Button*, void);
     DECL_LINK_TYPED(AddButtonHdl, Button*, void);
     DECL_LINK_TYPED(RemoveButtonHdl, Button*, void);
-    DECL_LINK(          SignatureHighlightHdl, void* );
+    DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void );
     DECL_LINK(          SignatureSelectHdl, void* );
     DECL_LINK(          StartVerifySignatureHdl, void* );
-    DECL_LINK_TYPED(          OKButtonHdl, Button*, void );
+    DECL_LINK_TYPED(OKButtonHdl, Button*, void );
 
     void                ImplGetSignatureInformations(bool bUseTempStream);
     void                ImplFillSignaturesBox();
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index ae1bca6a2183..1bd89e1d7a17 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -131,7 +131,7 @@ private:
     DECL_LINK_TYPED(    RemoveCertPBHdl, Button*, void );
     DECL_LINK_TYPED(    AddLocPBHdl, Button*, void );
     DECL_LINK_TYPED(    RemoveLocPBHdl, Button*, void );
-    DECL_LINK(          TrustCertLBSelectHdl, void* );
+    DECL_LINK_TYPED(    TrustCertLBSelectHdl, SvTreeListBox*, void );
     DECL_LINK(          TrustFileLocLBSelectHdl, void* );
 
     void                FillCertLB();
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index ab2636896da8..5f015f39c0d2 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -200,12 +200,11 @@ uno::Reference< css::security::XCertificate > CertificateChooser::GetSelectedCer
     return xCert;
 }
 
-IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl)
+IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void)
 {
     bool bEnable = GetSelectedCertificate().is();
     m_pViewBtn->Enable( bEnable );
     m_pOKBtn->Enable( bEnable );
-    return 0;
 }
 
 IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl)
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index acc87fd943e1..4dd2f7c39f42 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -309,7 +309,7 @@ void CertificateViewerDetailsTP::ActivatePage()
 {
 }
 
-IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl)
+IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry*    pEntry = m_pElementsLB->FirstSelected();
     OUString        aElementText;
@@ -326,8 +326,6 @@ IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl)
     m_pValueDetails->SetFont( bFixedWidthFont? m_aFixedWidthFont : m_aStdFont );
     m_pValueDetails->SetControlFont( bFixedWidthFont? m_aFixedWidthFont : m_aStdFont );
     m_pValueDetails->SetText( aElementText );
-
-    return 0;
 }
 
 struct CertPath_UserData
@@ -433,7 +431,7 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl)
+IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void)
 {
     OUString sStatus;
     SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected();
@@ -446,7 +444,6 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl)
 
     mpCertStatusML->SetText( sStatus );
     mpViewCertPB->Enable( pEntry && ( pEntry != mpCertPathLB->Last() ) );
-    return 0;
 }
 
 void CertificateViewerCertPathTP::Clear()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index eb24163e8bb4..627cae6ea282 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -370,14 +370,12 @@ short DigitalSignaturesDialog::Execute()
     return Dialog::Execute();
 }
 
-IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl)
+IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void)
 {
     bool bSel = m_pSignaturesLB->FirstSelected();
     m_pViewBtn->Enable( bSel );
     if ( m_pAddBtn->IsEnabled() ) // not read only
         m_pRemoveBtn->Enable( bSel );
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void)
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 5181f710b314..4e725caae7f7 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -309,10 +309,9 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, vo
     }
 }
 
-IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void)
 {
     ImplCheckButtons();
-    return 0;
 }
 
 IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl)