diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-16 11:00:16 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
commit | c784b1a339ab59b7cf5caacd10be5945ec3e0f9f (patch) | |
tree | 8da723597589cf913e98dcf33f7eb27c6f67343e /editeng | |
parent | 073b5e877eaae2dac44900a855ce8ca3cb60a782 (diff) |
convert Link<> to typed
Change-Id: Ie9f7f6a5dda1fd23558775b643e5b8fa850f4a89
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 8 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 12 |
3 files changed, 11 insertions, 13 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 5b1881a1000a..106483720d8e 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -921,12 +921,12 @@ EditPaM EditEngine::DeleteSelected(const EditSelection& rSel) void EditEngine::HandleBeginPasteOrDrop(PasteOrDropInfos& rInfos) { - pImpEditEngine->aBeginPasteOrDropHdl.Call(&rInfos); + pImpEditEngine->aBeginPasteOrDropHdl.Call(rInfos); } void EditEngine::HandleEndPasteOrDrop(PasteOrDropInfos& rInfos) { - pImpEditEngine->aEndPasteOrDropHdl.Call(&rInfos); + pImpEditEngine->aEndPasteOrDropHdl.Call(rInfos); } bool EditEngine::HasText() const @@ -1538,13 +1538,13 @@ void EditEngine::SetEndMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void> pImpEditEngine->aEndMovingParagraphsHdl = rLink; } -void EditEngine::SetBeginPasteOrDropHdl( const Link<>& rLink ) +void EditEngine::SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink ) { pImpEditEngine->aBeginPasteOrDropHdl = rLink; } -void EditEngine::SetEndPasteOrDropHdl( const Link<>& rLink ) +void EditEngine::SetEndPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink ) { pImpEditEngine->aEndPasteOrDropHdl = rLink; } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index a54e5f63537d..dd135898607c 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -484,8 +484,8 @@ private: Link<ImportInfo&,void> aImportHdl; Link<MoveParagraphsInfo&,void> aBeginMovingParagraphsHdl; Link<MoveParagraphsInfo&,void> aEndMovingParagraphsHdl; - Link<> aBeginPasteOrDropHdl; - Link<> aEndPasteOrDropHdl; + Link<PasteOrDropInfos&,void> aBeginPasteOrDropHdl; + Link<PasteOrDropInfos&,void> aEndPasteOrDropHdl; Link<> aModifyHdl; Link<> maBeginDropHdl; Link<> maEndDropHdl; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 44366fc4e314..18ad27cb33a4 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1787,20 +1787,18 @@ IMPL_LINK_NOARG_TYPED(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, v aBeginMovingHdl.Call( this ); } -IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos ) +IMPL_LINK_TYPED( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { UndoActionStart( EDITUNDO_DRAGANDDROP ); - maBeginPasteOrDropHdl.Call(pInfos); - return 0; + maBeginPasteOrDropHdl.Call(&rInfos); } -IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos ) +IMPL_LINK_TYPED( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { bPasting = false; - ImpTextPasted( pInfos->nStartPara, pInfos->nEndPara - pInfos->nStartPara + 1 ); - maEndPasteOrDropHdl.Call( pInfos ); + ImpTextPasted( rInfos.nStartPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); + maEndPasteOrDropHdl.Call( &rInfos ); UndoActionEnd( EDITUNDO_DRAGANDDROP ); - return 0; } IMPL_LINK_TYPED( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) |