make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

5 files changed, 12 insertions, 14 deletions

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index b21c252bc1e6..18fa4f8d7e25 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -68,7 +68,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog
 
     void                Test();
     DECL_LINK_TYPED(StopHdl, Button*, void);
-    DECL_LINK(TestHdl, void*);
+    DECL_LINK_TYPED(TestHdl, void*, void);
 public:
     explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent);
     virtual ~SwTestAccountSettingsDialog();
@@ -278,12 +278,11 @@ IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void)
     m_bStop = true;
 }
 
-IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl)
+IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, TestHdl, void*, void)
 {
     EnterWait();
     Test();
     LeaveWait();
-    return 0;
 }
 
 void SwTestAccountSettingsDialog::Test()
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index c7b708837dac..33f283b69730 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -477,11 +477,12 @@ IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl)
     return 0;
 }
 
-IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pSelect)
+IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void)
 {
+    SvTreeListEntry* pSelect = static_cast<SvTreeListEntry*>(p);
     //prevent nested calls of the select handler
     if(m_bInSelectHdl)
-        return 0;
+        return;
     EnterWait();
     m_bInSelectHdl = true;
     AddressUserData_Impl* pUserData = 0;
@@ -530,7 +531,6 @@ IMPL_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pS
                     !SWUnoHelper::UCB_IsReadOnlyFileName( pUserData->sURL ) );
     m_bInSelectHdl = false;
     LeaveWait();
-    return 0;
 }
 
 // detect the number of tables for a data source
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index cb542429007f..921ece655941 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -82,7 +82,7 @@ class SwAddressListDialog : public SfxModalDialog
     DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void);
     DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
 
-    DECL_LINK(StaticListBoxSelectHdl_Impl, SvTreeListEntry*);
+    DECL_LINK_TYPED(StaticListBoxSelectHdl_Impl, void*, void);
 
 public:
     SwAddressListDialog(SwMailMergeAddressBlockPage* pParent);
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 9b564897e4d8..6f264cb0db42 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -180,8 +180,8 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
 
     DECL_DLLPRIVATE_LINK_TYPED( StopHdl_Impl, Button*, void );
     DECL_DLLPRIVATE_LINK_TYPED( CloseHdl_Impl, Button* , void);
-    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
-    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
+    DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void );
+    DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void );
     DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void );
 
     SAL_DLLPRIVATE void        IterateMails();
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 46e34667986b..382c09cc9318 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -388,10 +388,9 @@ IMPL_LINK_NOARG_TYPED(SwSendMailDialog, CloseHdl_Impl, Button*, void)
     ModelessDialog::Show( false );
 }
 
-IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog )
+IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, pDialog, void )
 {
-    pDialog->SendMails();
-    return 0;
+    static_cast<SwSendMailDialog*>(pDialog)->SendMails();
 }
 
 IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void )
@@ -416,8 +415,9 @@ IMPL_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void )
     }
 }
 
-IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
+IMPL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, p, void )
 {
+    SwSendMailDialog* pDialog = static_cast<SwSendMailDialog*>(p);
     if(pDialog->m_pImpl->xMailDispatcher.is() &&
         pDialog->m_pImpl->xMailDispatcher->isStarted())
     {
@@ -425,7 +425,6 @@ IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
         pDialog->m_pStop->SetText(pDialog->m_sContinue);
         pDialog->m_pPaused->Show();
     }
-    return 0;
 }
 
 void  SwSendMailDialog::SendMails()