8 files changed, 16 insertions, 18 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 11bd97df1c12..a59e201d5118 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -186,7 +186,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     if (m_pSysWindow && m_pSysWindow->GetCloseHdl().IsSet())
     {
         // The closing frame has its own close handler.  Call it instead.
-        m_pSysWindow->GetCloseHdl().Call(m_pSysWindow);
+        m_pSysWindow->GetCloseHdl().Call(*m_pSysWindow);
         return;
     }
 
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index e2b388457f4c..78de8c97e30d 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -279,8 +279,8 @@ public:
 
     void            SetApplicationID( const OUString &rApplicationID );
 
-    void SetCloseHdl(const Link<>& rLink);
-    const Link<>& GetCloseHdl() const;
+    void SetCloseHdl(const Link<SystemWindow&,void>& rLink);
+    const Link<SystemWindow&,void>& GetCloseHdl() const;
 
     SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutIdle.IsActive(); }
 
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index ff52c67421a5..796c9594406e 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -56,7 +56,7 @@ class ScPreviewShell: public SfxViewShell
 private:
     void            Construct( vcl::Window* pParent );
     DECL_LINK_TYPED( ScrollHandler, ScrollBar*, void );
-    DECL_LINK(CloseHdl, SystemWindow*);
+    DECL_LINK_TYPED( CloseHdl, SystemWindow&, void);
     void            DoScroll( sal_uInt16 nMode );
     void            ExitPreview();
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 7c4f303b692c..47abf1b8740e 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -184,7 +184,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 ScPreviewShell::~ScPreviewShell()
 {
     if (mpFrameWindow)
-        mpFrameWindow->SetCloseHdl(Link<>()); // Remove close handler.
+        mpFrameWindow->SetCloseHdl(Link<SystemWindow&,void>()); // Remove close handler.
 
     // #108333#; notify Accessibility that Shell is dying and before destroy all
     BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) );
@@ -480,10 +480,9 @@ IMPL_LINK_TYPED( ScPreviewShell, ScrollHandler, ScrollBar*, pScroll, void )
     }
 }
 
-IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*,)
+IMPL_LINK_NOARG_TYPED(ScPreviewShell, CloseHdl, SystemWindow&, void)
 {
     ExitPreview();
-    return 0;
 }
 
 bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 06f70ef3f49a..b630edf51cba 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -55,22 +55,21 @@ IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void)
     OUString aPin ( m_pClientBox->getPin() );
     if ( RemoteServer::connectClient( aEntry->m_pClientInfo, aPin ) )
     {
-        CloseHdl( 0 );
+        CloseHdl( *this );
     }
 #endif
 }
 
 IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseClickHdl, Button*, void )
 {
-    CloseHdl(NULL);
+    CloseHdl(*this);
 }
-IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
+IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseHdl, SystemWindow&, void )
 {
 #ifdef ENABLE_SDREMOTE
     RemoteServer::restoreDiscoverable();
 #endif
     Close();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index 764d84469ef7..68bc9470e8b4 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -29,7 +29,7 @@ private:
     VclPtr<ClientBox>      m_pClientBox;
 
     DECL_DLLPRIVATE_LINK_TYPED( HandleConnectButton, Button*, void );
-    DECL_LINK( CloseHdl, void* );
+    DECL_LINK_TYPED( CloseHdl, SystemWindow&, void );
     DECL_LINK_TYPED( CloseClickHdl, Button*, void );
 public:
     RemoteDialog( vcl::Window* pWindow );
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 2f95022d02a1..b711cb342e0b 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -50,8 +50,8 @@ public:
 
     TaskPaneList*   mpTaskPaneList;
     Size            maMaxOutSize;
-    OUString   maRepresentedURL;
-    Link<> maCloseHdl;
+    OUString        maRepresentedURL;
+    Link<SystemWindow&,void> maCloseHdl;
 };
 
 SystemWindow::ImplData::ImplData()
@@ -1001,12 +1001,12 @@ void SystemWindow::SetApplicationID(const OUString &rApplicationID)
     mpWindowImpl->mpFrame->SetApplicationID( rApplicationID );
 }
 
-void SystemWindow::SetCloseHdl(const Link<>& rLink)
+void SystemWindow::SetCloseHdl(const Link<SystemWindow&,void>& rLink)
 {
     mpImplData->maCloseHdl = rLink;
 }
 
-const Link<>& SystemWindow::GetCloseHdl() const
+const Link<SystemWindow&,void>& SystemWindow::GetCloseHdl() const
 {
     return mpImplData->maCloseHdl;
 }
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 035cee47d12e..519d13f74e89 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1981,10 +1981,10 @@ void ImplHandleClose( vcl::Window* pWindow )
     if (pSysWin)
     {
         // See if the custom close handler is set.
-        const Link<>& rLink = pSysWin->GetCloseHdl();
+        const Link<SystemWindow&,void>& rLink = pSysWin->GetCloseHdl();
         if (rLink.IsSet())
         {
-            rLink.Call(pSysWin);
+            rLink.Call(*pSysWin);
             return;
         }
     }