make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

5 files changed, 14 insertions, 22 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index a7159e13496a..068c27e64e1c 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -79,12 +79,12 @@ class Desktop : public Application
         virtual void            OverrideSystemSettings( AllSettings& rSettings ) SAL_OVERRIDE;
         virtual void            AppEvent( const ApplicationEvent& rAppEvent ) SAL_OVERRIDE;
 
-        DECL_LINK( OpenClients_Impl, void* );
+        DECL_LINK_TYPED( OpenClients_Impl, void*, void );
 
         static void             OpenClients();
         static void             OpenDefault();
 
-        DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*);
+        DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
 
         static void             HandleAppEvent( const ApplicationEvent& rAppEvent );
         static ResMgr*          GetDesktopResManager();
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 798b69552ab3..b916d5396536 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1870,7 +1870,7 @@ class ExitTimer : public Timer
     }
 };
 
-IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
+IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void)
 {
     try {
         OpenClients();
@@ -1892,14 +1892,12 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
         OUString a( "UNO exception during client open:\n"  );
         Application::Abort( a + e.Message );
     }
-    return 0;
 }
 
 // enable acceptors
-IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl)
+IMPL_STATIC_LINK_NOARG_TYPED(Desktop, EnableAcceptors_Impl, void*, void)
 {
     enableAcceptors();
-    return 0;
 }
 
 
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index c406336bbb86..a7075f128be5 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -282,19 +282,18 @@ OUString CreateMD5FromString( const OUString& aMsg )
 class ProcessEventsClass_Impl
 {
 public:
-    DECL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void* pEvent );
-    DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void* pEvent );
+    DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, void );
+    DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
 };
 
-IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent )
+IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
 {
     // Application events are processed by the Desktop::HandleAppEvent implementation.
     Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) );
     delete static_cast<ApplicationEvent*>(pEvent);
-    return 0;
 }
 
-IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent )
+IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void )
 {
     // Documents requests are processed by the OfficeIPCThread implementation
     ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent);
@@ -304,7 +303,6 @@ IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent
         OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
         delete pDocsRequest;
     }
-    return 0;
 }
 
 void ImplPostForeignAppEvent( ApplicationEvent* pEvent )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index cd2176a559d7..0c876826b330 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -655,7 +655,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
     return true;
 }
 
-void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink )
+void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink )
 {
     if ( m_nEventID )
         Application::RemoveUserEvent( m_nEventID );
@@ -967,7 +967,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void)
 
 
 
-IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
+IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     bool bLockInterface = (bool) _bLockInterface;
@@ -994,8 +994,6 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
     m_pExtensionBox->enableButtons( !bLockInterface );
 
     clearEventID();
-
-    return 0;
 }
 
 
@@ -1287,7 +1285,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void)
 }
 
 
-IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
+IMPL_LINK_TYPED( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     bool bLockInterface = (bool) _bLockInterface;
@@ -1310,8 +1308,6 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
     m_pCancelBtn->Enable( bLockInterface );
     m_pUpdateBtn->Enable( false );
     clearEventID();
-
-    return 0;
 }
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index df227bd726c6..8f7b3009f604 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -68,7 +68,7 @@ public:
 
     void            openWebBrowser( const OUString & sURL, const OUString & sTitle ) const;
     Dialog*         getWindow() const { return m_pVCLWindow; };
-    void            PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink = false );
+    void            PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink = false );
     void            clearEventID() { m_nEventID = 0; }
 
     virtual void    showProgress( bool bStart ) = 0;
@@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog,
     DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void );
     DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
     DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_DLLPRIVATE_LINK( startProgress, void * );
+    DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
 
 public:
                     ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -201,7 +201,7 @@ class UpdateRequiredDialog : public ModalDialog,
     DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void );
     DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void );
     DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_DLLPRIVATE_LINK( startProgress, void * );
+    DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
     DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
 
     static bool     isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );