summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-16 10:40:08 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 08:19:32 +0200
commit073b5e877eaae2dac44900a855ce8ca3cb60a782 (patch)
tree203bbeb159cdec425414bbd0ffbea062f426e121 /editeng
parentcd015186a0b30eefba1ce283a7cbb9e0f0d5e598 (diff)
convert Link<> to typed
Change-Id: Ie40dff6f1c40bf1866dc9947479299412abfd5ad
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/impedit.hxx4
-rw-r--r--editeng/source/editeng/impedit2.cxx4
-rw-r--r--editeng/source/outliner/outliner.cxx14
4 files changed, 10 insertions, 16 deletions
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<ImportInfo&,void> EditEngine::GetImportHdl() const
return pImpEditEngine->aImportHdl;
}
-void EditEngine::SetBeginMovingParagraphsHdl( const Link<>& rLink )
+void EditEngine::SetBeginMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void>& rLink )
{
pImpEditEngine->aBeginMovingParagraphsHdl = rLink;
}
-void EditEngine::SetEndMovingParagraphsHdl( const Link<>& rLink )
+void EditEngine::SetEndMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void>& 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<EditStatus&,void> aStatusHdlLink;
Link<EENotify&,void> aNotifyHdl;
Link<ImportInfo&,void> aImportHdl;
- Link<> aBeginMovingParagraphsHdl;
- Link<> aEndMovingParagraphsHdl;
+ Link<MoveParagraphsInfo&,void> aBeginMovingParagraphsHdl;
+ Link<MoveParagraphsInfo&,void> 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 )