convert Link<> to typed

Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

22 files changed, 38 insertions, 56 deletions

diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index dd3db5ea65c6..f3602e44b536 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -28,7 +28,7 @@ BarGeometryResources::BarGeometryResources(VclBuilderContainer* pWindow)
     pWindow->get(m_pLB_Geometry, "shape");
 }
 
-void BarGeometryResources::SetSelectHdl( const Link<>& rLink )
+void BarGeometryResources::SetSelectHdl( const Link<ListBox&,void>& rLink )
 {
     m_pLB_Geometry->SetSelectHdl( rLink );
 }
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index 168cd4eb7e87..31936724669f 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -38,7 +38,7 @@ public:
     sal_Int32 GetSelectEntryPos() const;
     void SelectEntryPos(sal_Int32 nPos);
 
-    void SetSelectHdl( const Link<>& rLink );
+    void SetSelectHdl( const Link<ListBox&,void>& rLink );
 
 private:
     VclPtr<FixedText> m_pFT_Geometry;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 748dcc15812d..7f8d9485c294 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -340,10 +340,9 @@ void ErrorBarResources::UpdateControlStates()
     }
 }
 
-IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2 )
+IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen2, ListBox&, void )
 {
    CategoryChosen(NULL);
-   return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index fafa6fc25d1f..ed3a1f3c2ac6 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -291,10 +291,10 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
     }
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
+IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
 {
     if( !m_bUpdateOtherControls )
-        return 0;
+        return;
 
     {
         // locked controllers
@@ -314,7 +314,6 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
 
     // update other controls
     initControlsFromModel();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void)
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 6896466a7d23..94e10c99b9b1 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -44,7 +44,7 @@ public:
     virtual void ActivatePage() SAL_OVERRIDE;
 
 private:
-    DECL_LINK( SelectSchemeHdl, void* );
+    DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
     DECL_LINK_TYPED( SelectShading, CheckBox&, void );
     DECL_LINK_TYPED( SelectRoundedEdgeOrObjectLines, CheckBox&, void );
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 0ee407795f0e..a4796a815175 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -444,12 +444,13 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pBut
             if(pInfo)
                 applyLightSourceToModel( nL );
         }
-        SelectColorHdl( pListBox );
+        SelectColorHdl( *pListBox );
     }
 }
 
-IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox )
+IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void )
 {
+    ColorLB* pListBox = static_cast<ColorLB*>(&rBox);
     if(pListBox==m_pLB_AmbientLight)
     {
         m_bInCommitToModel = true;
@@ -475,7 +476,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox
         }
     }
     this->updatePreview();
-    return 0;
 }
 
 IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index f8cec2693c06..03a2684124e9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -61,7 +61,7 @@ public:
 
 private:
     DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void );
-    DECL_LINK( SelectColorHdl, ColorLB* );
+    DECL_LINK_TYPED( SelectColorHdl, ListBox&, void );
     DECL_LINK_TYPED( ColorDialogHdl, Button*, void );
     DECL_LINK_TYPED( PreviewChangeHdl, SvxLightCtl3D*, void );
     DECL_LINK_TYPED( PreviewSelectHdl, SvxLightCtl3D*, void );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 62e6e35719b9..590c7543c4dd 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -198,7 +198,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
 
         if( nPos < m_pLB_CrossesAt->GetEntryCount() )
             m_pLB_CrossesAt->SelectEntryPos( nPos );
-        CrossesAtSelectHdl( nullptr );
+        CrossesAtSelectHdl( *m_pLB_CrossesAt );
 
         if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SfxItemState::SET || bZero )
         {
@@ -231,7 +231,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
     }
     else
         m_pLB_PlaceLabels->SetNoSelection();
-    PlaceLabelsSelectHdl( nullptr );
+    PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
 
     // Tick marks
     long nTicks = 0, nMinorTicks = 0;
@@ -313,7 +313,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
     m_bSupportAxisPositioning = bSupportAxisPositioning;
 }
 
-IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
+IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
 {
     sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
     m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
@@ -324,11 +324,10 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
     if( 0 == m_pED_CrossesAtCategory->GetSelectEntryCount() )
         m_pED_CrossesAtCategory->SelectEntryPos(0);
 
-    PlaceLabelsSelectHdl( nullptr );
-    return 0;
+    PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
 }
 
-IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl)
+IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
 {
     sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
 
@@ -340,8 +339,6 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl)
             bEnableTickmarkPlacement=false;
     }
     m_pBxPlaceTicks->Enable(bEnableTickmarkPlacement);
-
-    return 0;
 }
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index a05ae58aeb49..bb1a6b4b4028 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -50,8 +50,8 @@ public:
     void SupportAxisPositioning( bool bSupportAxisPositioning );
 
 private: //methods:
-    DECL_LINK( CrossesAtSelectHdl, void* );
-    DECL_LINK( PlaceLabelsSelectHdl, void* );
+    DECL_LINK_TYPED( CrossesAtSelectHdl, ListBox&, void );
+    DECL_LINK_TYPED( PlaceLabelsSelectHdl, ListBox&, void );
 
 private: //member:
     VclPtr<VclFrame>       m_pFL_AxisLine;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index f356a05b53b9..55feb294811b 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -56,7 +56,7 @@ public:
 
 private:
     DECL_LINK_TYPED( Dim3DLookCheckHdl, CheckBox&, void );
-    DECL_LINK( SelectSchemeHdl, void* );
+    DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
 
 private:
     VclPtr<CheckBox> m_pCB_3DLook;
@@ -110,11 +110,10 @@ IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void
         m_pChangeListener->stateChanged(this);
 }
 
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl)
+IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void)
 {
     if(m_pChangeListener)
         m_pChangeListener->stateChanged(this);
-    return 0;
 }
 
 class SortByXValuesResourceGroup : public ChangingResource
@@ -320,7 +319,7 @@ public:
     virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
 
 private:
-    DECL_LINK( SplineTypeListBoxHdl, void* );
+    DECL_LINK_TYPED( SplineTypeListBoxHdl, ListBox&, void );
 
 private:
     VclPtr<ListBox>      m_pLB_Spline_Type;
@@ -393,11 +392,10 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
     rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue());
     rParameter.nSplineOrder = static_cast< sal_Int32 >( m_pMF_SplineOrder->GetValue());
 }
-IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl)
+IMPL_LINK_NOARG_TYPED(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
 {
     m_pFT_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
     m_pMF_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
-    return 0;
 }
 
 class SteppedPropertiesDialog : public ModalDialog
@@ -493,7 +491,7 @@ public:
     void fillParameter( ChartTypeParameter& rParameter );
 
 private:
-    DECL_LINK( LineTypeChangeHdl, void* );
+    DECL_LINK_TYPED( LineTypeChangeHdl, ListBox&, void );
     DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void );
     DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void );
     SplinePropertiesDialog& getSplinePropertiesDialog();
@@ -586,11 +584,10 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
             break;
     }
 }
-IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl)
+IMPL_LINK_NOARG_TYPED(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
-    return 0;
 }
 IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
 {
@@ -644,7 +641,7 @@ public:
     void fillParameter( ChartTypeParameter& rParameter );
 
 private:
-    DECL_LINK( GeometryChangeHdl, void* );
+    DECL_LINK_TYPED( GeometryChangeHdl, ListBox&, void );
 
 private:
     BarGeometryResources m_aGeometryResources;
@@ -676,11 +673,10 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
         rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
 }
 
-IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
+IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
 {
     if( m_pChangeListener )
         m_pChangeListener->stateChanged(this);
-    return 0;
 }
 
 ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
@@ -891,10 +887,9 @@ IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
     }
 }
 
-IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl)
+IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void)
 {
     selectMainType();
-    return 0;
 }
 
 void ChartTypeTabPage::selectMainType()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index fb9311403c33..3cf4d7a1a1d1 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -74,7 +74,7 @@ protected:
     void commitToModel( const ChartTypeParameter& rParameter );
     void selectMainType();
 
-    DECL_LINK( SelectMainTypeHdl, void* );
+    DECL_LINK_TYPED( SelectMainTypeHdl, ListBox&, void );
     DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void );
 
 protected:
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 42639c3213b8..5206848b4df7 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -258,7 +258,7 @@ enum AxisTypeListBoxEntry
     TYPE_DATE=2
 };
 
-IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
+IMPL_LINK_NOARG_TYPED(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
 {
     const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos();
     if( nPos==TYPE_DATE )
@@ -269,7 +269,6 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
         m_pCbxLogarithm->Check(false);
     EnableControls();
     SetNumFormat();
-    return 0;
 }
 
 VclPtr<SfxTabPage> ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index c1143afab46b..da93b7025f7a 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -99,7 +99,7 @@ private:
 
     void EnableControls();
 
-    DECL_LINK( SelectAxisTypeHdl, void* );
+    DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void );
     DECL_LINK_TYPED( EnableValueHdl, Button*, void );
     DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField* );
 
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 76a36f2e2175..f19ca18b3e9c 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -123,7 +123,7 @@ private:
     bool                 m_bEnableDataTableDialog;
 
     DECL_LINK_TYPED( CategoryChosen, Button*, void );
-    DECL_LINK( CategoryChosen2, void* );
+    DECL_LINK_TYPED( CategoryChosen2, ListBox&, void );
     DECL_LINK_TYPED( SynchronizePosAndNeg, CheckBox&, void );
     DECL_LINK( PosValueChanged, void * );
     DECL_LINK_TYPED( IndicatorChanged, Button *, void );
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 572974b38097..11a453340e31 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -343,14 +343,12 @@ IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
         setReverse(mxModel, aCID, bChecked);
 }
 
-IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
     sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos();
 
     setLabelPosition(mxModel, aCID, nPos);
-
-    return 0;
 }
 
 }} // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 50c0021c2f26..708610143955 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -93,7 +93,7 @@ private:
     void Initialize();
 
     DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
-    DECL_LINK(ListBoxHdl, void*);
+    DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
 };
 
 } } // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index b22570a55823..3d74fd22c654 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -573,11 +573,10 @@ IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void)
         setGridVisible(mxModel, GridType::HOR_MINOR, bChecked);
 }
 
-IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl)
+IMPL_LINK_NOARG_TYPED(ChartElementsPanel, LegendPosHdl, ListBox&, void)
 {
     sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos();
     setLegendPos(mxModel, nPos);
-    return 0;
 }
 
 void ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible)
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 952c64a02c8a..96a12888bc83 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -114,7 +114,7 @@ private:
     void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible);
 
     DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
-    DECL_LINK(LegendPosHdl, void*);
+    DECL_LINK_TYPED(LegendPosHdl, ListBox&, void);
 };
 
 } } // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 6a455ecf1656..0777408c85f6 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -412,14 +412,12 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void)
     setShowNegativeError(mxModel, aCID, bNeg);
 }
 
-IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
     sal_Int32 nPos = mpLBType->GetSelectEntryPos();
 
     setTypePos(mxModel, aCID, nPos);
-
-    return 0;
 }
 
 IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, NumericField*, pMetricField)
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index 2182635dcd9f..57fb90f5fb39 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -89,7 +89,7 @@ private:
     void Initialize();
 
     DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void);
-    DECL_LINK(ListBoxHdl, void*);
+    DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
     DECL_LINK(NumericFieldHdl, NumericField*);
 };
 
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index e8032f7e9f85..98106e3790af 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -482,14 +482,12 @@ IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void)
     setAttachedAxisType(mxModel, aCID, bChecked);
 }
 
-IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl)
+IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
 
     sal_Int32 nPos = mpLBLabelPlacement->GetSelectEntryPos();
     setDataLabelPlacement(mxModel, aCID, nPos);
-
-    return 0;
 }
 
 }} // end of namespace ::chart::sidebar
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index bd3d3e3234c0..f3e3ab6d3d4e 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -110,7 +110,7 @@ private:
 
     DECL_LINK_TYPED(CheckBoxHdl, Button*, void);
     DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void);
-    DECL_LINK(ListBoxHdl, void*);
+    DECL_LINK_TYPED(ListBoxHdl, ListBox&, void);
 };
 
 } } // end of namespace ::chart::sidebar