Use various typed ToolBox::Set*Hdl Links

Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0

12 files changed, 33 insertions, 61 deletions

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b070a567f9f9..c892d43d0dfe 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2886,15 +2886,13 @@ void SfxHelpWindow_Impl::ShowStartPage()
 
 
 
-IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox )
+IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void )
 {
     if ( pToolBox )
     {
         bGrabFocusToToolBox = pToolBox->HasChildPathFocus();
         DoAction( pToolBox->GetCurItemId() );
     }
-
-    return 1;
 }
 
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 8ae94ed52bcb..246652604026 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -470,7 +470,7 @@ public:
     inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
                             getFrame() const { return xFrame; }
 
-    inline void             SetSelectHdl( const Link<>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
+    inline void             SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
     void                    ToggleIndex( bool bOn );
     void                    SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch );
     void                    SetPageStyleHeaderOff() const;
@@ -520,7 +520,7 @@ friend class SfxHelpIndexWindow_Impl;
     void                SaveConfig();
     void                ShowStartPage();
 
-    DECL_LINK(          SelectHdl, ToolBox* );
+    DECL_LINK_TYPED(    SelectHdl, ToolBox*, void );
     DECL_LINK(OpenHdl, void *);
     DECL_LINK(          SelectFactoryHdl, SfxHelpIndexWindow_Impl* );
     DECL_LINK(          ChangeHdl, HelpListener_Impl* );
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 60ac3df51cb2..ce3dabb234b1 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -249,14 +249,12 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange )
     SfxFloatingWindow::StateChanged( nStateChange );
 }
 
-IMPL_LINK( SfxRecordingFloat_Impl, Select, ToolBox*, pToolBar )
+IMPL_LINK_TYPED( SfxRecordingFloat_Impl, Select, ToolBox*, pToolBar, void )
 {
     (void)pToolBar;
     sal_Int16   nKeyModifier( (sal_Int16)m_pTbx->GetModifier() );
     if ( xStopRecTbxCtrl.is() )
         xStopRecTbxCtrl->execute( nKeyModifier );
-
-    return 1;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 186eaa53d970..65a6a6a8e22c 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -839,7 +839,7 @@ namespace sfx2
         virtual void Dying() SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnToolboxClicked, ToolBox* );
+        DECL_LINK_TYPED( OnToolboxClicked, ToolBox*, void );
         DECL_LINK( OnMenuItemSelected, Menu* );
         DECL_LINK( DockingChanged, TitledDockingWindow* );
         ::std::unique_ptr< PopupMenu > impl_createPopupMenu() const;
@@ -963,7 +963,7 @@ namespace sfx2
     }
 
 
-    IMPL_LINK( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox )
+    IMPL_LINK_TYPED( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox, void )
     {
         if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
         {
@@ -977,8 +977,6 @@ namespace sfx2
             aMenuRect.SetPos( i_pToolBox->GetPosPixel() );
             pMenu->Execute( &m_rDockingWindow, aMenuRect, POPUPMENU_EXECUTE_DOWN );
         }
-
-        return 0;
     }
 
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 802f8bad263a..9c82774eea12 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2428,11 +2428,10 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
     }
 }
 
-IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
+IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox, void )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
     FamilySelect(nEntry);
-    return 0;
 }
 
 static OUString lcl_GetLabel(uno::Any& rAny)
@@ -2453,16 +2452,15 @@ static OUString lcl_GetLabel(uno::Any& rAny)
     return sRet;
 }
 
-IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
+IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox, void )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry != SID_STYLE_NEW_BY_EXAMPLE ||
             ToolBoxItemBits::DROPDOWN != (pBox->GetItemBits(nEntry)&ToolBoxItemBits::DROPDOWN))
         ActionSelect(nEntry);
-    return 0;
 }
 
-IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
+IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry == SID_STYLE_NEW_BY_EXAMPLE &&
@@ -2481,7 +2479,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
             a >>= xUICommands;
         }
         if(!xUICommands.is())
-            return 0;
+            return;
         try
         {
             uno::Any aCommand = xUICommands->getByName(".uno:StyleNewByExample");
@@ -2511,7 +2509,6 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         }
         pBox->Invalidate();
     }
-    return 0;
 }
 
 IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 402f006589fb..339a086693b2 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -225,7 +225,7 @@ namespace sfx2
     }
 
 
-    sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback )
+    sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback )
     {
         // Add the menu before the closer button.
         const sal_uInt16 nItemCount( m_aToolbox->GetItemCount() );
@@ -244,7 +244,7 @@ namespace sfx2
     }
 
 
-    IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
+    IMPL_LINK_TYPED( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void )
     {
         const sal_uInt16 nId = pToolBox->GetCurItemId();
 
@@ -261,8 +261,6 @@ namespace sfx2
                 NULL
             );
         }
-
-        return 0;
     }
 
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 53f5a0577aa5..a2f01b66b57d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -453,7 +453,7 @@ void SfxTemplateManagerDlg::writeSettings ()
     aViewSettings.SetUserData(aSettings);
 }
 
-IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXViewHdl)
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg,TBXViewHdl, ToolBox *, void)
 {
     const sal_uInt16 nCurItemId = mpViewBar->GetCurItemId();
 
@@ -470,11 +470,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXViewHdl)
         OnFolderNew();
     else if (nCurItemId == mpViewBar->GetItemId(VIEWBAR_SAVE))
         OnTemplateSaveAs();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXActionHdl)
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXActionHdl, ToolBox *, void)
 {
     const sal_uInt16 nCurItemId = mpActionBar->GetCurItemId();
 
@@ -482,11 +480,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXActionHdl)
         OnTemplateSearch();
     else if (nCurItemId == mpActionBar->GetItemId(ACTIONBAR_TEMPLATE))
         OnTemplateLink();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXTemplateHdl)
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, TBXTemplateHdl, ToolBox *, void)
 {
     const sal_uInt16 nCurItemId = mpTemplateBar->GetCurItemId();
 
@@ -502,11 +498,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXTemplateHdl)
         OnTemplateAsDefault();
     else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_EXPORT))
         OnTemplateExport();
-
-    return 0;
 }
 
-IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox, void)
 {
     const sal_uInt16 nCurItemId = pBox->GetCurItemId();
 
@@ -557,8 +551,6 @@ IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox)
         pBox->EndSelection();
         pBox->Invalidate();
     }
-
-    return 0;
 }
 
 IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem)
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 50dd7f6dc9fd..665b4ce891a4 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -51,7 +51,7 @@ public:
     virtual void        FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE;
     virtual void        StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
 
-    DECL_LINK( Select, ToolBox * );
+    DECL_LINK_TYPED( Select, ToolBox *, void );
 };
 
 #endif
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8c49b71761dd..76e41684954c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -381,9 +381,9 @@ private:
     VclPtr<DropToolBox_Impl>    m_aActionTbL;
     VclPtr<ToolBox>             m_aActionTbR;
 
-    DECL_LINK( ToolBoxLSelect, ToolBox* );
-    DECL_LINK( ToolBoxRSelect, ToolBox* );
-    DECL_LINK( ToolBoxRClick, ToolBox* );
+    DECL_LINK_TYPED( ToolBoxLSelect, ToolBox*, void );
+    DECL_LINK_TYPED( ToolBoxRSelect, ToolBox*, void );
+    DECL_LINK_TYPED( ToolBoxRClick, ToolBox*, void );
     DECL_LINK( MenuSelectHdl, Menu* );
 
 protected:
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 24fba7dea6fd..78dec70fa3fa 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -75,10 +75,10 @@ void SidebarToolBox::dispose()
 
     if (mbAreHandlersRegistered)
     {
-        SetDropdownClickHdl(Link<>());
-        SetClickHdl(Link<>());
-        SetDoubleClickHdl(Link<>());
-        SetSelectHdl(Link<>());
+        SetDropdownClickHdl(Link<ToolBox *, void>());
+        SetClickHdl(Link<ToolBox *, void>());
+        SetDoubleClickHdl(Link<ToolBox *, void>());
+        SetSelectHdl(Link<ToolBox *, void>());
         SetActivateHdl(Link<>());
         SetDeactivateHdl(Link<>());
         mbAreHandlersRegistered = false;
@@ -229,7 +229,7 @@ void SidebarToolBox::RegisterHandlers()
     }
 }
 
-IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox)
+IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void)
 {
     if (pToolBox != NULL)
     {
@@ -241,43 +241,36 @@ IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox)
                 xWindow->setFocus();
         }
     }
-    return 1;
 }
 
-IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox)
+IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void)
 {
     if (pToolBox == NULL)
-        return 0;
+        return;
 
     Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
     if (xController.is())
         xController->click();
-
-    return 1;
 }
 
-IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox)
+IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void)
 {
     if (pToolBox == NULL)
-        return 0;
+        return;
 
     Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
     if (xController.is())
         xController->doubleClick();
-
-    return 1;
 }
 
-IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox)
+IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void)
 {
     if (pToolBox == NULL)
-        return 0;
+        return;
 
     Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
     if (xController.is())
         xController->execute((sal_Int16)pToolBox->GetModifier());
-
-    return 1;
 }
 
 IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG)
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index fca67caf09b7..d4a0fbea06c7 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -185,15 +185,13 @@ void TitleBar::PaintFocus (const Rectangle& rFocusBox)
     Pop();
 }
 
-IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox)
+IMPL_LINK_TYPED(TitleBar, SelectionHandler, ToolBox*, pToolBox, void)
 {
     (void)pToolBox;
     OSL_ASSERT(maToolBox.get()==pToolBox);
     const sal_uInt16 nItemId (maToolBox->GetHighlightItemId());
 
     HandleToolBoxItemClick(nItemId);
-
-    return sal_True;
 }
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index 77f588d50423..c65be5ec709d 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -68,7 +68,7 @@ private:
     Image maIcon;
 
     void PaintTitle (const Rectangle& rTitleBox);
-    DECL_LINK(SelectionHandler, ToolBox*);
+    DECL_LINK_TYPED(SelectionHandler, ToolBox*, void);
 };
 
 } } // end of namespace sfx2::sidebar