Use various typed ToolBox::Set*Hdl Links

Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0

14 files changed, 28 insertions, 47 deletions

diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 10b3a0d323de..2b4379d97895 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -127,7 +127,7 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn )
     return 0;
 }
 
-IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl)
+IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void)
 {
     if (m_pAlignBox->GetCurItemId())
     {
@@ -141,7 +141,6 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl)
         const SwEnvItem& rItem = static_cast<const SwEnvItem&>( GetItemSet().Get(FN_ENVELOP) );
         m_pAlignBox->CheckItem(m_aIds[rItem.eAlign], true);
     }
-    return 0;
 }
 
 VclPtr<SfxTabPage> SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index a71c96b3a9e6..33c553032802 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -48,7 +48,7 @@ class SwEnvPrtPage : public SfxTabPage
     VclPtr<Printer>     pPrt;
 
     DECL_LINK(ClickHdl, void *);
-    DECL_LINK(AlignHdl, void *);
+    DECL_LINK_TYPED(AlignHdl, ToolBox *, void);
     DECL_LINK( ButtonHdl, Button * );
 
     SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>( GetParentDialog());}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index f4b783cc2ae6..06774c80a89d 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -954,7 +954,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
     return 0;
 }
 
-IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
+IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -1096,8 +1096,6 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
 
         UpdateSubType();
     }
-
-    return sal_True;
 }
 
 IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index a37aa5809fda..a7bf3f0163ac 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -79,7 +79,7 @@ class SwFldVarPage : public SwFldPage
     DECL_LINK(TypeHdl, void *);
     DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
     DECL_LINK(ModifyHdl, void * = 0);
-    DECL_LINK( TBClickHdl, ToolBox *pTB = 0);
+    DECL_LINK_TYPED( TBClickHdl, ToolBox *, void );
     DECL_LINK(ChapterHdl, void * = 0);
     DECL_LINK(SeparatorHdl, void * = 0);
 
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index ad16a82acf59..1a76bbb016a8 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -84,10 +84,9 @@ void SwMailMergeChildWin::dispose()
     SfxFloatingWindow::dispose();
 }
 
-IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
+IMPL_LINK_NOARG_TYPED(SwMailMergeChildWin, BackHdl, ToolBox *, void)
 {
     GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SfxCallMode::ASYNCHRON);
-    return 0;
 }
 
 void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index fdb4a6f4fb69..6a1edfc684c4 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -75,7 +75,7 @@ protected:
     virtual void    Resize() SAL_OVERRIDE;
     virtual void    Click() SAL_OVERRIDE;
     DECL_LINK( MenuHdl, Menu * );
-    DECL_LINK( DropdownClickHdl, void* );
+    DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void );
     void            ApplyFormula();
     void            CancelFormula();
 
diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx
index 742cb322437d..ade2a24c57cf 100644
--- a/sw/source/uibase/inc/mailmergechildwindow.hxx
+++ b/sw/source/uibase/inc/mailmergechildwindow.hxx
@@ -26,7 +26,7 @@
 class SwMailMergeChildWin : public SfxFloatingWindow
 {
     VclPtr<ToolBox> m_pBackTB;
-    DECL_LINK( BackHdl, void* );
+    DECL_LINK_TYPED( BackHdl, ToolBox*, void );
 
 public:
     SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent);
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index c24e446a77fc..885a42348012 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -101,9 +101,9 @@ class SwNavigationPI : public vcl::Window,
     void MakeMark();
 
     DECL_LINK( DocListBoxSelectHdl, ListBox * );
-    DECL_LINK( ToolBoxSelectHdl, ToolBox * );
-    DECL_LINK( ToolBoxClickHdl, ToolBox * );
-    DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* );
+    DECL_LINK_TYPED( ToolBoxSelectHdl, ToolBox *, void );
+    DECL_LINK_TYPED( ToolBoxClickHdl, ToolBox *, void );
+    DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void );
     DECL_LINK( EditAction, NumEditAction * );
     DECL_LINK( EditGetFocus, NumEditAction * );
     DECL_LINK( DoneLink, SfxPoolItem * );
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 85c45282e6eb..65ea2c87fa9a 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -142,7 +142,7 @@ class SwScrollNaviPopup : public SfxPopupWindow
     using Window::GetQuickHelpText;
 
 protected:
-        DECL_LINK(SelectHdl, ToolBox*);
+        DECL_LINK_TYPED(SelectHdl, ToolBox*, void);
         virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index c20543cdd59e..77fd2c321dbb 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -340,7 +340,7 @@ static const char * const aStrArr[] = {
     return 0;
 }
 
-IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl)
+IMPL_LINK_NOARG_TYPED(SwInputWindow, DropdownClickHdl, ToolBox *, void)
 {
     sal_uInt16 nCurID = GetCurItemId();
     EndSelection(); // reset back CurItemId !
@@ -354,8 +354,6 @@ IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl)
             break;
         }
     }
-
-    return sal_True;
 }
 
 void SwInputWindow::Click( )
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 9bae5285d1d7..18d6342c8694 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -482,7 +482,7 @@ VclPtr<SfxPopupWindow> SwScrollNaviPopup::Clone() const
     return VclPtr<SwScrollNaviPopup>::Create( GetId(), GetFrame(), GetParent() );
 }
 
-IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
+IMPL_LINK_TYPED(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void)
 {
     sal_uInt16 nSet = pSet->GetCurItemId();
     if( nSet != NID_PREV && nSet != NID_NEXT )
@@ -507,7 +507,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
         SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ),
                                      cmd, aArgs );
     }
-    return 0;
 }
 
 SwScrollNaviToolBox::~SwScrollNaviToolBox()
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index a4b11c9ae026..73bf32b90ee8 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -237,7 +237,7 @@ void PagePropertyPanel::Initialize()
 {
     // popup for page orientation
     const sal_uInt16 nIdOrientation = mpToolBoxOrientation->GetItemId(UNO_ORIENTATION);
-    Link<> aLink = LINK( this, PagePropertyPanel, ClickOrientationHdl );
+    Link<ToolBox *, void> aLink = LINK( this, PagePropertyPanel, ClickOrientationHdl );
     mpToolBoxOrientation->SetDropdownClickHdl( aLink );
     mpToolBoxOrientation->SetSelectHdl( aLink );
     mpToolBoxOrientation->SetItemImage( nIdOrientation, mImgPortrait);
@@ -300,11 +300,9 @@ VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationCont
     return VclPtr<PageOrientationControl>::Create( pParent, *this , mpPageItem->IsLandscape() );
 }
 
-IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox )
+IMPL_LINK_TYPED( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox, void )
 {
     maOrientationPopup.Show( *pToolBox );
-
-    return 0L;
 }
 
 void PagePropertyPanel::ExecuteOrientationChange( const bool bLandscape )
@@ -411,11 +409,9 @@ void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored )
     GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SfxCallMode::RECORD, mpPageItem.get(),  0L );
 }
 
-IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox )
+IMPL_LINK_TYPED( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox, void )
 {
     maMarginPopup.Show( *pToolBox );
-
-    return 0L;
 }
 
 void PagePropertyPanel::ClosePageMarginPopup()
@@ -446,11 +442,9 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper )
     mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, mpPageSizeItem.get(),  0L );
 }
 
-IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox )
+IMPL_LINK_TYPED( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox, void )
 {
     maSizePopup.Show( *pToolBox );
-
-    return 0L;
 }
 
 void PagePropertyPanel::ClosePageSizePopup()
@@ -474,11 +468,9 @@ void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType )
     mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SfxCallMode::RECORD, mpPageColumnTypeItem.get(),  0L );
 }
 
-IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox )
+IMPL_LINK_TYPED( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox, void )
 {
     maColumnPopup.Show( *pToolBox );
-
-    return 0L;
 }
 
 void PagePropertyPanel::ClosePageColumnPopup()
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 81721360d0bc..7951a01cad8a 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -200,10 +200,10 @@ namespace sw { namespace sidebar {
         bool mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify;
 
         // handler for popup toolboxes to show the popups
-        DECL_LINK(ClickOrientationHdl, ToolBox* );
-        DECL_LINK(ClickMarginHdl, ToolBox* );
-        DECL_LINK(ClickSizeHdl, ToolBox* );
-        DECL_LINK(ClickColumnHdl, ToolBox* );
+        DECL_LINK_TYPED(ClickOrientationHdl, ToolBox*, void);
+        DECL_LINK_TYPED(ClickMarginHdl, ToolBox*, void);
+        DECL_LINK_TYPED(ClickSizeHdl, ToolBox*, void);
+        DECL_LINK_TYPED(ClickColumnHdl, ToolBox*, void);
 
         void Initialize();
 
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 1c99755c8408..5a351fa79e75 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -196,12 +196,12 @@ void SwNavigationPI::UsePage(SwWrtShell *pSh)
 
 // Select handler of the toolboxes
 
-IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
+IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
 {
     const sal_uInt16 nCurrItemId = pBox->GetCurItemId();
     SwView *pView = GetCreateView();
     if (!pView)
-        return 1;
+        return;
     SwWrtShell &rSh = pView->GetWrtShell();
     // Get MouseModifier for Outline-Move
 
@@ -238,7 +238,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
                     _ZoomIn();
                 }
             }
-            return sal_True;
+            return;
         // Functions that will trigger a direct action.
 
         case FN_SELECT_FOOTER:
@@ -330,12 +330,11 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
     }
     if(bFocusToDoc)
         pView->GetEditWin().GrabFocus();
-    return sal_True;
 }
 
 // Click handler of the toolboxes
 
-IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
+IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void )
 {
     const sal_uInt16 nCurrItemId = pBox->GetCurItemId();
     switch (nCurrItemId)
@@ -347,11 +346,9 @@ IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
         }
         break;
     }
-
-    return sal_True;
 }
 
-IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
+IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
 {
     const sal_uInt16 nCurrItemId = pBox->GetCurItemId();
     switch (nCurrItemId)
@@ -409,7 +406,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
         }
         break;
     }
-    return sal_True;
 }
 
 SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) :
@@ -780,7 +776,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
 
 //  Handler
 
-    Link<> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
+    Link<ToolBox *, void> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
     aContentToolBox->SetSelectHdl( aLk );
     aGlobalToolBox->SetSelectHdl( aLk );
     aDocListBox->SetSelectHdl(LINK(this, SwNavigationPI,