convert Link<> to typed

Change-Id: I3d35a0bb75b6989dd13371543d1bdf3ef5f47641

3 files changed, 23 insertions, 22 deletions

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 3a102be60996..785bb0cfde6d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -920,7 +920,7 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT &&
          KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
     {
-        GetDoubleClickHdl().Call( NULL );
+        GetDoubleClickHdl().Call( *this );
         bHandled = true;
     }
 
@@ -1085,7 +1085,7 @@ IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void)
 
 IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, OpenHdl, Button*, void)
 {
-    m_pResultsLB->GetDoubleClickHdl().Call(m_pResultsLB);
+    m_pResultsLB->GetDoubleClickHdl().Call(*m_pResultsLB);
 }
 
 IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl)
@@ -1106,7 +1106,7 @@ Control* SearchTabPage_Impl::GetLastFocusControl()
     return m_pOpenBtn;
 }
 
-void SearchTabPage_Impl::SetDoubleClickHdl( const Link<>& rLink )
+void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink )
 {
     m_pResultsLB->SetDoubleClickHdl( rLink );
 }
@@ -1211,7 +1211,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
     switch ( nAction )
     {
         case MID_OPEN :
-            GetDoubleClickHdl().Call( NULL );
+            GetDoubleClickHdl().Call( *this );
             break;
 
         case MID_RENAME :
@@ -1271,7 +1271,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
         }
         else if ( KEY_RETURN == nCode )
         {
-            GetDoubleClickHdl().Call( NULL );
+            GetDoubleClickHdl().Call( *this );
             nRet = true;
         }
     }
@@ -1335,7 +1335,7 @@ void BookmarksTabPage_Impl::dispose()
 
 IMPL_LINK_NOARG_TYPED(BookmarksTabPage_Impl, OpenHdl, Button*, void)
 {
-    m_pBookmarksBox->GetDoubleClickHdl().Call(m_pBookmarksBox);
+    m_pBookmarksBox->GetDoubleClickHdl().Call(*m_pBookmarksBox);
 }
 
 void BookmarksTabPage_Impl::ActivatePage()
@@ -1349,7 +1349,7 @@ Control* BookmarksTabPage_Impl::GetLastFocusControl()
     return m_pBookmarksPB;
 }
 
-void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<>& rLink )
+void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink )
 {
     m_pBookmarksBox->SetDoubleClickHdl(rLink);
 }
@@ -1725,10 +1725,6 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink )
     aPageDoubleClickLink = rLink;
     if ( pIPage )
         pIPage->SetDoubleClickHdl( aPageDoubleClickLink );
-    if ( pSPage )
-        pSPage->SetDoubleClickHdl( aPageDoubleClickLink );
-    if ( pBPage )
-        pBPage->SetDoubleClickHdl( aPageDoubleClickLink );
 }
 
 IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool)
@@ -1736,6 +1732,12 @@ IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeLis
     return aPageDoubleClickLink.Call(p);
 }
 
+IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl, ListBox&, r, void)
+{
+    aPageDoubleClickLink.Call(&r);
+}
+
+
 void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive )
 {
     if ( !rFactory.isEmpty() )
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 175b6f5f3b3e..fcbf5ed7f257 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -227,15 +227,15 @@ public:
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
 
-    void                SetDoubleClickHdl( const Link<>& rLink );
+    void                SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
     inline void         SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
     OUString            GetSelectEntry() const;
     void                ClearPage();
     inline void         SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
-    inline bool     HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
+    inline bool         HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
     inline OUString     GetSearchText() const { return m_pSearchED->GetText(); }
-    inline bool     IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
-    bool            OpenKeyword( const OUString& rKeyword );
+    inline bool         IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
+    bool                OpenKeyword( const OUString& rKeyword );
 };
 
 // class BookmarksTabPage_Impl -------------------------------------------
@@ -269,7 +269,7 @@ public:
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
 
-    void                SetDoubleClickHdl( const Link<>& rLink );
+    void                SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
     OUString            GetSelectEntry() const;
     void                AddBookmarks( const OUString& rTitle, const OUString& rURL );
     void                SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); }
@@ -318,6 +318,7 @@ private:
     DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void);
     DECL_LINK_TYPED(KeywordHdl, IndexTabPage_Impl&, void);
     DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool);
+    DECL_LINK_TYPED(TabPageDoubleClickHdl, ListBox&, void);
 
 public:
     SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent );
@@ -374,7 +375,7 @@ SearchTabPage_Impl* SfxHelpIndexWindow_Impl::GetSearchPage()
     if ( !pSPage )
     {
         pSPage = VclPtr<SearchTabPage_Impl>::Create( m_pTabCtrl, this );
-        pSPage->SetDoubleClickHdl( aPageDoubleClickLink );
+        pSPage->SetDoubleClickHdl( LINK(this, SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl) );
     }
     return pSPage;
 }
@@ -384,7 +385,7 @@ BookmarksTabPage_Impl* SfxHelpIndexWindow_Impl::GetBookmarksPage()
     if ( !pBPage )
     {
         pBPage = VclPtr<BookmarksTabPage_Impl>::Create( m_pTabCtrl, this );
-        pBPage->SetDoubleClickHdl( aPageDoubleClickLink );
+        pBPage->SetDoubleClickHdl( LINK(this, SfxHelpIndexWindow_Impl, TabPageDoubleClickHdl) );
     }
     return pBPage;
 }
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index aa2a062589a9..c89044e3d9bc 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -149,7 +149,7 @@ class SfxNewFileDialog_Impl
 
     DECL_LINK(RegionSelect, ListBox*);
     DECL_LINK(TemplateSelect, void*);
-    DECL_LINK(DoubleClick, ListBox*);
+    DECL_LINK_TYPED(DoubleClick, ListBox&, void);
     DECL_LINK(Expand, void*);
     DECL_LINK_TYPED(LoadFile, Button*, void);
     sal_uInt16  GetSelectedTemplatePos() const;
@@ -283,13 +283,11 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
     return 0;
 }
 
-IMPL_LINK( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
+IMPL_LINK_NOARG_TYPED( SfxNewFileDialog_Impl, DoubleClick, ListBox&, void )
 {
-    (void)pListBox;
     // Still loadning
     if ( !xDocShell.Is() || !xDocShell->GetProgress() )
         pAntiImpl->EndDialog(RET_OK);
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, LoadFile, Button*, void)