From 073b5e877eaae2dac44900a855ce8ca3cb60a782 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 16 Sep 2015 10:40:08 +0200 Subject: convert Link<> to typed Change-Id: Ie40dff6f1c40bf1866dc9947479299412abfd5ad --- editeng/source/editeng/editeng.cxx | 4 ++-- editeng/source/editeng/impedit.hxx | 4 ++-- editeng/source/editeng/impedit2.cxx | 4 ++-- editeng/source/outliner/outliner.cxx | 14 ++++---------- 4 files changed, 10 insertions(+), 16 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7c62f46b0c1c..5b1881a1000a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1528,12 +1528,12 @@ Link EditEngine::GetImportHdl() const return pImpEditEngine->aImportHdl; } -void EditEngine::SetBeginMovingParagraphsHdl( const Link<>& rLink ) +void EditEngine::SetBeginMovingParagraphsHdl( const Link& rLink ) { pImpEditEngine->aBeginMovingParagraphsHdl = rLink; } -void EditEngine::SetEndMovingParagraphsHdl( const Link<>& rLink ) +void EditEngine::SetEndMovingParagraphsHdl( const Link& rLink ) { pImpEditEngine->aEndMovingParagraphsHdl = rLink; } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 54b3f2ead560..a54e5f63537d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -482,8 +482,8 @@ private: Link aStatusHdlLink; Link aNotifyHdl; Link aImportHdl; - Link<> aBeginMovingParagraphsHdl; - Link<> aEndMovingParagraphsHdl; + Link aBeginMovingParagraphsHdl; + Link aEndMovingParagraphsHdl; Link<> aBeginPasteOrDropHdl; Link<> aEndPasteOrDropHdl; Link<> aModifyHdl; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 96b2304d65df..f158d148273b 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2119,7 +2119,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n } MoveParagraphsInfo aMoveParagraphsInfo( aOldPositions.Min(), aOldPositions.Max(), nNewPos ); - aBeginMovingParagraphsHdl.Call( &aMoveParagraphsInfo ); + aBeginMovingParagraphsHdl.Call( aMoveParagraphsInfo ); if ( IsUndoEnabled() && !IsInUndo()) InsertUndo(new EditUndoMoveParagraphs(pEditEngine, aOldPositions, nNewPos)); @@ -2154,7 +2154,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n GetParaPortions().Insert(nRealNewPos+i, pTmpPortion); } - aEndMovingParagraphsHdl.Call( &aMoveParagraphsInfo ); + aEndMovingParagraphsHdl.Call( aMoveParagraphsInfo ); if ( GetNotifyHdl().IsSet() ) { diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 0e3105a182ed..44366fc4e314 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1781,13 +1781,10 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara ) return 0; } -IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl) +IMPL_LINK_NOARG_TYPED(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) { - if( !IsInUndo() ) aBeginMovingHdl.Call( this ); - - return 0; } IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos ) @@ -1806,19 +1803,16 @@ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos ) return 0; } -IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos ) +IMPL_LINK_TYPED( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) { - - pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 ); - sal_Int32 nChangesStart = std::min( pInfos->nStartPara, pInfos->nDestPara ); + pParaList->MoveParagraphs( rInfos.nStartPara, rInfos.nDestPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); + sal_Int32 nChangesStart = std::min( rInfos.nStartPara, rInfos.nDestPara ); sal_Int32 nParas = pParaList->GetParagraphCount(); for ( sal_Int32 n = nChangesStart; n < nParas; n++ ) ImplCalcBulletText( n, false, false ); if( !IsInUndo() ) aEndMovingHdl.Call( this ); - - return 0; } static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat& rN2 ) -- cgit v1.2.3