Kaydet (Commit) c784b1a3 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ie9f7f6a5dda1fd23558775b643e5b8fa850f4a89
üst 073b5e87
......@@ -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;
}
......
......@@ -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;
......
......@@ -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 )
......
......@@ -462,8 +462,8 @@ public:
// MT: Can't create new virtual functions like for ParagraphInserted/Deleted, musst be compatible in SRC638, change later...
void SetBeginMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void>& rLink );
void SetEndMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void>& rLink );
void SetBeginPasteOrDropHdl( const Link<>& rLink );
void SetEndPasteOrDropHdl( const Link<>& rLink );
void SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink );
void SetEndPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink );
virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
virtual void ParagraphInserted( sal_Int32 nNewParagraph );
......
......@@ -620,8 +620,8 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* );
DECL_LINK_TYPED( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void );
DECL_LINK_TYPED( EndMovingParagraphsHdl, MoveParagraphsInfo&, void );
DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* );
DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* );
DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos&, void );
DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos&, void );
DECL_LINK_TYPED( EditEngineNotifyHdl, EENotify&, void );
void ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd );
bool ImplHasNumberFormat( sal_Int32 nPara ) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment