diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-07 13:48:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
| commit | 8d927d3f82a33a464662e4b54a8a07d30d4d1a19 (patch) | |
| tree | d65da75b786634550eb1e7fa4b1859d63e968dfe /sc | |
| parent | 61623d5b90510ae6c791a41031d586a9316e74c4 (diff) | |
convert Link<> to typed
Change-Id: Ia2706c308c6297d05b2862e9f86fc0f2ee90e4f0
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/tabbgcolordlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/sidebar/CellLineStyleControl.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/sidebar/CellLineStyleControl.hxx | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index b0576cac3332..a598549dd6d4 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -63,7 +63,7 @@ private: void FillColorValueSets_Impl(); - DECL_LINK(TabBgColorDblClickHdl_Impl, void *); + DECL_LINK_TYPED(TabBgColorDblClickHdl_Impl, ValueSet*, void); DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); }; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 337cf71762f5..fc2373ed8675 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -117,16 +117,13 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() m_pTabBgColorSet->SelectItem(nSelectedItem); } -IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) -/* - Handler, called when color selection is changed -*/ +/// Handler, called when color selection is changed +IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; EndDialog( RET_OK ); - return 0; } // Handler, called when the OK button is pushed diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 141027f14f08..c4f9c718bfe6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -111,7 +111,7 @@ void CellLineStyleControl::SetAllNoSel() maCellLineStyleValueSet->StartSelection(); } -IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) +IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) { if(pControl == maCellLineStyleValueSet.get()) { @@ -180,8 +180,6 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) SetAllNoSel(); mrCellAppearancePropertyPanel.EndCellLineStylePopupMode(); } - - return 0L; } IMPL_LINK_TYPED(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 5647f0e96425..36d2347ac379 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -41,7 +41,7 @@ private: void Initialize(); void SetAllNoSel(); - DECL_LINK(VSSelectHdl, void*); + DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); DECL_LINK_TYPED(PBClickHdl, Button*, void); public: |