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 /starmath | |
| parent | d30aedb2a381e89a5a3466f06c95ff7636c9306d (diff) | |
convert Link<> to typed
Change-Id: I9ce05712af8300c8bcea6ea0f670b57cce1ca43d
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/edit.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/edit.cxx | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index b277bcdd3ba0..a672ad6d74e6 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -72,7 +72,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - DECL_LINK(EditStatusHdl ,EditStatus *); + DECL_LINK_TYPED(EditStatusHdl, EditStatus&, void); DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); void CreateEditView(); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 4996e44579b3..d7d7d0e2e805 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -141,7 +141,7 @@ void SmEditWindow::dispose() EditEngine *pEditEngine = pEditView->GetEditEngine(); if (pEditEngine) { - pEditEngine->SetStatusEventHdl( Link<>() ); + pEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() ); pEditEngine->RemoveView( pEditView.get() ); } pEditView.reset(); @@ -570,15 +570,10 @@ void SmEditWindow::CreateEditView() } -IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, /*pStat*/ ) +IMPL_LINK_NOARG_TYPED( SmEditWindow, EditStatusHdl, EditStatus&, void ) { - if (!pEditView) - return 1; - else - { + if (pEditView) Resize(); - return 0; - } } IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void ) @@ -718,7 +713,7 @@ void SmEditWindow::LoseFocus() { EditEngine *pEditEngine = GetEditEngine(); if (pEditEngine) - pEditEngine->SetStatusEventHdl( Link<>() ); + pEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() ); Window::LoseFocus(); @@ -1099,7 +1094,7 @@ void SmEditWindow::DeleteEditView( SmViewShell & /*rView*/ ) std::unique_ptr<EditEngine> xEditEngine(pEditView->GetEditEngine()); if (xEditEngine) { - xEditEngine->SetStatusEventHdl( Link<>() ); + xEditEngine->SetStatusEventHdl( Link<EditStatus&,void>() ); xEditEngine->RemoveView( pEditView.get() ); } pEditView.reset(); |