Convert vcl Button Link<> click handler to typed Link<Button*,void>

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

8 files changed, 29 insertions, 49 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 353473ca6c8d..887338c32818 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -55,7 +55,7 @@ private:
     bool                mbInitialized;
 
     sal_uInt16              GetSelectedEntryPos() const;
-    DECL_LINK(ViewButtonHdl, void *);
+    DECL_LINK_TYPED(ViewButtonHdl, Button*, void);
     DECL_LINK(          CertificateHighlightHdl, void* );
     DECL_LINK(          CertificateSelectHdl, void* );
 
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 2a0134a0d5a9..b3b6de53ece5 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -129,7 +129,7 @@ private:
     OUString            msCertOK;
     OUString            msCertNotValidated;
 
-    DECL_LINK(          ViewCertHdl, void* );
+    DECL_LINK_TYPED(    ViewCertHdl, Button*, void );
     DECL_LINK(          CertSelectHdl, void* );
     void                Clear();
     SvTreeListEntry*        InsertCert( SvTreeListEntry* _pParent, const OUString& _rName,
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index a3cdb392bb45..843d450f9cb4 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -88,13 +88,13 @@ private:
     bool m_bHasDocumentSignature;
     bool m_bWarningShowSignMacro;
 
-    DECL_LINK(ViewButtonHdl, void *);
-    DECL_LINK(AddButtonHdl, void *);
-    DECL_LINK(RemoveButtonHdl, void *);
+    DECL_LINK_TYPED(ViewButtonHdl, Button*, void);
+    DECL_LINK_TYPED(AddButtonHdl, Button*, void);
+    DECL_LINK_TYPED(RemoveButtonHdl, Button*, void);
     DECL_LINK(          SignatureHighlightHdl, void* );
     DECL_LINK(          SignatureSelectHdl, void* );
     DECL_LINK(          StartVerifySignatureHdl, void* );
-    DECL_LINK(          OKButtonHdl, 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 1d0b18addae5..ae1bca6a2183 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -61,7 +61,7 @@ private:
     VclPtr<MacroSecurityTP>    mpLevelTP;
     VclPtr<MacroSecurityTP>    mpTrustSrcTP;
 
-    DECL_LINK(          OkBtnHdl, void* );
+    DECL_LINK_TYPED(          OkBtnHdl, Button*, void );
 public:
     MacroSecurity(vcl::Window* pParent,
         const css::uno::Reference< css::uno::XComponentContext>& rxCtx,
@@ -99,7 +99,7 @@ private:
     sal_uInt16   mnCurLevel;
 
 protected:
-    DECL_LINK(RadioButtonHdl, void *);
+    DECL_LINK_TYPED(RadioButtonHdl, Button*, void);
 
 public:
                         MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg );
@@ -127,10 +127,10 @@ private:
     bool                mbAuthorsReadonly;
     bool                mbURLsReadonly;
 
-    DECL_LINK(          ViewCertPBHdl, void* );
-    DECL_LINK(          RemoveCertPBHdl, void* );
-    DECL_LINK(          AddLocPBHdl, void* );
-    DECL_LINK(          RemoveLocPBHdl, void* );
+    DECL_LINK_TYPED(    ViewCertPBHdl, Button*, void );
+    DECL_LINK_TYPED(    RemoveCertPBHdl, Button*, void );
+    DECL_LINK_TYPED(    AddLocPBHdl, Button*, void );
+    DECL_LINK_TYPED(    RemoveLocPBHdl, Button*, void );
     DECL_LINK(          TrustCertLBSelectHdl, void* );
     DECL_LINK(          TrustFileLocLBSelectHdl, void* );
 
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 9c5e28e94b67..ab2636896da8 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -214,10 +214,9 @@ IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl)
+IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void)
 {
     ImplShowCertificateDetails();
-    return 0;
 }
 
 void CertificateChooser::ImplShowCertificateDetails()
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 8dbd5e83f143..acc87fd943e1 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -420,7 +420,7 @@ void CertificateViewerCertPathTP::ActivatePage()
     }
 }
 
-IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl)
+IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void)
 {
     SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected();
     if( pEntry )
@@ -431,8 +431,6 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl)
                 false );
         aViewer->Execute();
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl)
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 14bc8bd959e0..eb24163e8bb4 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -380,7 +380,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl)
+IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void)
 {
     // Export all other signatures...
     SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
@@ -407,7 +407,6 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl)
     }
 
     EndDialog(RET_OK);
-    return 0;
 }
 
 IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl)
@@ -416,16 +415,15 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl)
+IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void)
 {
     ImplShowSignaturesDetails();
-    return 0;
 }
 
-IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
+IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
 {
     if( ! canAdd())
-        return 0;
+        return;
     try
     {
         uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureHelper.GetSecurityEnvironment();
@@ -439,13 +437,13 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
             if ( !xCert.is() )
             {
                 SAL_WARN( "xmlsecurity.dialogs", "no certificate selected" );
-                return -1;
+                return;
             }
             OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() );
             if ( aCertSerial.isEmpty() )
             {
                 OSL_FAIL( "Error in Certificate, problem with serial number!" );
-                return -1;
+                return;
             }
 
             maSignatureHelper.StartMission();
@@ -525,14 +523,12 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
         ImplGetSignatureInformations(true);
         ImplFillSignaturesBox();
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl)
+IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void)
 {
     if (!canRemove())
-        return 0;
+        return;
     if( m_pSignaturesLB->FirstSelected() )
     {
         try
@@ -569,8 +565,6 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl)
             ImplFillSignaturesBox();
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl)
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index b607fa3c5ad7..5181f710b314 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -48,14 +48,12 @@
 using namespace ::com::sun::star;
 
 
-IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurity, OkBtnHdl, Button*, void)
 {
     mpLevelTP->ClosePage();
     mpTrustSrcTP->ClosePage();
 
     EndDialog( RET_OK );
-
-    return 0;
 }
 
 MacroSecurity::MacroSecurity( vcl::Window* _pParent,
@@ -184,7 +182,7 @@ void MacroSecurityLevelTP::dispose()
     MacroSecurityTP::dispose();
 }
 
-IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityLevelTP, RadioButtonHdl, Button*, void)
 {
     sal_uInt16 nNewLevel = 0;
     if( m_pVeryHighRB->IsChecked() )
@@ -199,8 +197,6 @@ IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl)
         mnCurLevel = nNewLevel;
         mpDlg->EnableReset();
     }
-
-    return 0;
 }
 
 void MacroSecurityLevelTP::ClosePage()
@@ -219,7 +215,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons()
 }
 
 
-IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void)
 {
     if( m_pTrustCertLB->FirstSelected() )
     {
@@ -242,10 +238,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl)
             aViewer->Execute();
         }
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void)
 {
     if( m_pTrustCertLB->FirstSelected() )
     {
@@ -255,11 +250,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl)
         FillCertLB();
         ImplCheckButtons();
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void)
 {
     try
     {
@@ -269,7 +262,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl)
         short nRet = xFolderPicker->execute();
 
         if( ui::dialogs::ExecutableDialogResults::OK != nRet )
-            return 0;
+            return;
 
         OUString aPathStr = xFolderPicker->getDirectory();
         INetURLObject aNewObj( aPathStr );
@@ -295,11 +288,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl)
     {
         SAL_WARN( "xmlsecurity.dialogs", "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception from folder picker" );
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl)
+IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void)
 {
     sal_Int32  nSel = m_pTrustFileLocLB->GetSelectEntryPos();
     if( nSel != LISTBOX_ENTRY_NOTFOUND )
@@ -316,8 +307,6 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl)
         }
         ImplCheckButtons();
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl)