diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
commit | 69a06ca6bf45c4e2aceb06262bfa1e7be6f565e8 (patch) | |
tree | ad1d1e4c9c72fac1ef620e26b865d4001a538df1 /sc | |
parent | d30aedb2a381e89a5a3466f06c95ff7636c9306d (diff) |
convert Link<> to typed
Change-Id: I9ce05712af8300c8bcea6ea0f670b57cce1ca43d
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 12 |
3 files changed, 7 insertions, 16 deletions
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 46af42032740..39fb5b2e151d 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -211,8 +211,7 @@ private: bool bPagebreak:1; // Page break preview mode bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - DECL_DLLPRIVATE_STATIC_LINK (ScViewData, EmptyEditHdl, void*); - DECL_DLLPRIVATE_LINK (EditEngineHdl, EditStatus*); + DECL_DLLPRIVATE_LINK_TYPED( EditEngineHdl, EditStatus&, void ); SAL_DLLPRIVATE void CalcPPT(); SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 1dbe3062e3d2..006c00c2a385 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5591,16 +5591,14 @@ struct SpellCheckStatus SpellCheckStatus() : mbModified(false) {}; - DECL_LINK (EventHdl, EditStatus*); + DECL_LINK_TYPED( EventHdl, EditStatus&, void ); }; -IMPL_LINK(SpellCheckStatus, EventHdl, EditStatus*, pStatus) +IMPL_LINK_TYPED(SpellCheckStatus, EventHdl, EditStatus&, rStatus, void) { - EditStatusFlags nStatus = pStatus->GetStatusWord(); + EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & EditStatusFlags::WRONGWORDCHANGED) mbModified = true; - - return 0; } } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 1e64916a71c2..a789d7c69ce9 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1100,14 +1100,9 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // needed, wenn position changed } -IMPL_STATIC_LINK_NOARG(ScViewData, EmptyEditHdl) +IMPL_LINK_TYPED( ScViewData, EditEngineHdl, EditStatus&, rStatus, void ) { - return 0; -} - -IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) -{ - EditStatusFlags nStatus = pStatus->GetStatusWord(); + EditStatusFlags nStatus = rStatus.GetStatusWord(); if (nStatus & (EditStatusFlags::HSCROLL | EditStatusFlags::TEXTHEIGHTCHANGED | EditStatusFlags::TEXTWIDTHCHANGED | EditStatusFlags::CURSOROUT)) { EditGrowY(); @@ -1120,7 +1115,6 @@ IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) pEditView[eWhich]->ShowCursor(false); } } - return 0; } void ScViewData::EditGrowX() @@ -1401,7 +1395,7 @@ void ScViewData::ResetEditView() } if (pEngine) - pEngine->SetStatusEventHdl( LINK( this, ScViewData, EmptyEditHdl ) ); + pEngine->SetStatusEventHdl( Link<EditStatus&,void>() ); } void ScViewData::KillEditView() |