Use various typed ToolBox::Set*Hdl Links

Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0

6 files changed, 8 insertions, 13 deletions

diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 6ba139216869..7924a17dd102 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -526,7 +526,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff)
     }
 }
 
-IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSortAction, ToolBox*, void )
 {
     const sal_uInt16 nCurItem = m_aActions->GetCurItemId();
     if ( SID_ADD_CONTROL_PAIR == nCurItem )
@@ -559,7 +559,6 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
             m_pListBox->GetModel()->Resort();
         }
     }
-    return 0L;
 }
 
 
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 049ae98da0f1..0339327b5b70 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -334,7 +334,7 @@ void Condition::dispose()
     VclHBox::dispose();
 }
 
-IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
+IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void )
 {
     sal_uInt16 nId( m_pActions->GetCurItemId() );
     if ( !m_pColorFloat )
@@ -355,15 +355,12 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
     m_pColorFloat->SetPosPixel(m_pActions->GetItemPopupPosition(nId,m_pColorFloat->GetSizePixel()));
     m_pColorFloat->StartPopupMode(m_pActions);
     m_pColorFloat->StartSelection();
-
-    return 1;
 }
 
-IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG_TYPED( Condition, OnFormatAction, ToolBox*, void )
 {
     Color aCol(COL_AUTO);
     ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol);
-    return 0L;
 }
 
 IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 506cba302f4f..bd2f64036b88 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -100,8 +100,8 @@ namespace rptui
 
         ConditionalExpressions          m_aConditionalExpressions;
 
-        DECL_LINK( OnFormatAction,      ToolBox* );
-        DECL_LINK( DropdownClick,       ToolBox* );
+        DECL_LINK_TYPED( OnFormatAction, ToolBox*, void );
+        DECL_LINK_TYPED( DropdownClick, ToolBox*, void );
         DECL_LINK( OnConditionAction,   Button* );
 
     public:
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index efd047adf125..52006da08acd 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1152,7 +1152,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl )
     return 0L;
 }
 
-IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
+IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void )
 {
 
     sal_uInt16 nCommand = m_pToolBox->GetCurItemId();
@@ -1192,7 +1192,6 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
             }
         }
     }
-    return 1L;
 }
 
 IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index b547b33c8fff..254433189c53 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -71,7 +71,7 @@ class  OAddFieldWindow  :public FloatingWindow
 
     DECL_LINK( OnDoubleClickHdl, void* );
     DECL_LINK( OnSelectHdl,      void* );
-    DECL_LINK( OnSortAction,     ToolBox* );
+    DECL_LINK_TYPED( OnSortAction, ToolBox*, void );
 
     OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION;
     void operator =(const OAddFieldWindow&) SAL_DELETED_FUNCTION;
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index b67c1285ba98..b9c19478969d 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -85,7 +85,7 @@ private:
     DECL_LINK( OnControlFocusLost, Control* );
     DECL_LINK( OnControlFocusGot, Control* );
     DECL_LINK( LBChangeHdl, ListBox* );
-    DECL_LINK( OnFormatAction,      ToolBox* );
+    DECL_LINK_TYPED( OnFormatAction, ToolBox*, void );
 
     /** returns the groups
         @return the groups which now have to check which one changes