diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 11:48:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
| commit | 81bec2e5535aeef7d6ae76f92124537d528f5c23 (patch) | |
| tree | 121866ab62bb6b8286b078707098f16076389644 /sc/source/ui/app | |
| parent | c784b1a339ab59b7cf5caacd10be5945ec3e0f9f (diff) | |
convert Link<> to typed
Change-Id: I87d4697fe032e3095406becdda026447edd1d68a
Diffstat (limited to 'sc/source/ui/app')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 777c8b8fc7e6..6bb0d37b9fa4 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2066,7 +2066,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) +IMPL_LINK_NOARG_TYPED(ScInputHandler, ModifyHdl, LinkParamNone*, void) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) @@ -2081,7 +2081,6 @@ IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) lcl_RemoveTabs(aText); pInputWin->SetTextString(aText); } - return 0; } /** diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6293db35be83..a717f00fdd38 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1238,10 +1238,9 @@ void ScMultiTextWnd::Resize() SetScrollBarRange(); } -IMPL_LINK(ScMultiTextWnd, ModifyHdl, EENotify*, pNotify) +IMPL_LINK_NOARG_TYPED(ScMultiTextWnd, ModifyHdl, LinkParamNone*, void) { - ScTextWnd::NotifyHdl( pNotify ); - return 0; + ScTextWnd::NotifyHdl(nullptr); } IMPL_LINK_TYPED(ScMultiTextWnd, NotifyHdl, EENotify&, rNotify, void) @@ -1816,7 +1815,7 @@ void ScTextWnd::StartEditEngine() pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); } -IMPL_LINK_NOARG(ScTextWnd, NotifyHdl) +IMPL_LINK_NOARG_TYPED(ScTextWnd, NotifyHdl, LinkParamNone*, void) { if (pEditView && !bInputMode) { @@ -1828,8 +1827,6 @@ IMPL_LINK_NOARG(ScTextWnd, NotifyHdl) if ( pHdl && !pHdl->IsInOwnChange() ) pHdl->InputChanged( pEditView, true ); // #i20282# InputChanged must know if called from modify handler } - - return 0; } void ScTextWnd::StopEditEngine( bool bAll ) @@ -1846,7 +1843,7 @@ void ScTextWnd::StopEditEngine( bool bAll ) aString = pEditEngine->GetText(); bIsInsertMode = pEditView->IsInsertMode(); bool bSelection = pEditView->HasSelection(); - pEditEngine->SetModifyHdl(Link<>()); + pEditEngine->SetModifyHdl(Link<LinkParamNone*,void>()); DELETEZ(pEditView); DELETEZ(pEditEngine); |