From 3c99f8500f657ed84b316390d5175a6f5e56bc69 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 4 Oct 2015 15:05:38 +0200 Subject: convert Link<> to typed Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb Reviewed-on: https://gerrit.libreoffice.org/19305 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- chart2/source/controller/sidebar/ChartAxisPanel.cxx | 4 +--- chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartElementsPanel.cxx | 3 +-- chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 4 +--- chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 4 +--- chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) (limited to 'chart2/source/controller/sidebar') 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 -- cgit