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

convert Link<> to typed

Change-Id: I6a4fade1688dfce9aec1530da51ea874cddfcbc0
Reviewed-on: https://gerrit.libreoffice.org/18812Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst a5eaa6be
...@@ -87,7 +87,7 @@ public: ...@@ -87,7 +87,7 @@ public:
void ShowWin(); void ShowWin();
DECL_LINK( SelTableCellsNotify, SwWrtShell * ); DECL_LINK_TYPED( SelTableCellsNotify, SwWrtShell&, void );
void SetFormula( const OUString& rFormula, bool bDelSel = true ); void SetFormula( const OUString& rFormula, bool bDelSel = true );
const SwView* GetView() const{return pView;} const SwView* GetView() const{return pView;}
......
...@@ -160,7 +160,7 @@ public: ...@@ -160,7 +160,7 @@ public:
void Invalidate(); void Invalidate();
// select table cells for editing of formulas in the ribbonbar // select table cells for editing of formulas in the ribbonbar
inline void SelTableCells( const Link<> &rLink, bool bMark = true ); inline void SelTableCells( const Link<SwWrtShell&,void> &rLink, bool bMark = true );
inline void EndSelTableCells(); inline void EndSelTableCells();
// leave per word or per line selection mode. Is usually called in MB-Up. // leave per word or per line selection mode. Is usually called in MB-Up.
...@@ -560,7 +560,7 @@ private: ...@@ -560,7 +560,7 @@ private:
bool m_bRetainSelection :1; // Do not remove selections bool m_bRetainSelection :1; // Do not remove selections
Point m_aStart; Point m_aStart;
Link<> m_aSelTableLink; Link<SwWrtShell&,void> m_aSelTableLink;
// resets the cursor stack after movement by PageUp/-Down // resets the cursor stack after movement by PageUp/-Down
SAL_DLLPRIVATE void _ResetCursorStack(); SAL_DLLPRIVATE void _ResetCursorStack();
...@@ -609,7 +609,7 @@ inline void SwWrtShell::ResetCursorStack() ...@@ -609,7 +609,7 @@ inline void SwWrtShell::ResetCursorStack()
_ResetCursorStack(); _ResetCursorStack();
} }
inline void SwWrtShell::SelTableCells(const Link<> &rLink, bool bMark ) inline void SwWrtShell::SelTableCells(const Link<SwWrtShell&,void> &rLink, bool bMark )
{ {
SetSelTableCells( true ); SetSelTableCells( true );
m_bClearMark = bMark; m_bClearMark = bMark;
......
...@@ -418,12 +418,12 @@ void SwInputWindow::CancelFormula() ...@@ -418,12 +418,12 @@ void SwInputWindow::CancelFormula()
const sal_Unicode CH_LRE = 0x202a; const sal_Unicode CH_LRE = 0x202a;
const sal_Unicode CH_PDF = 0x202c; const sal_Unicode CH_PDF = 0x202c;
IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller ) IMPL_LINK_TYPED( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void )
{ {
if(bIsTable) if(bIsTable)
{ {
SwFrameFormat* pTableFormat = pCaller->GetTableFormat(); SwFrameFormat* pTableFormat = rCaller.GetTableFormat();
OUString sBoxNms( pCaller->GetBoxNms() ); OUString sBoxNms( rCaller.GetBoxNms() );
OUString sTableNm; OUString sTableNm;
if( pTableFormat && aAktTableName != pTableFormat->GetName() ) if( pTableFormat && aAktTableName != pTableFormat->GetName() )
sTableNm = pTableFormat->GetName(); sTableNm = pTableFormat->GetName();
...@@ -456,7 +456,6 @@ IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller ) ...@@ -456,7 +456,6 @@ IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller )
} }
else else
aEdit->GrabFocus(); aEdit->GrabFocus();
return 0;
} }
void SwInputWindow::SetFormula( const OUString& rFormula, bool bDelFlag ) void SwInputWindow::SetFormula( const OUString& rFormula, bool bDelFlag )
......
...@@ -783,7 +783,7 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool ) ...@@ -783,7 +783,7 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool )
long SwWrtShell::DefaultDrag(const Point *, bool ) long SwWrtShell::DefaultDrag(const Point *, bool )
{ {
if( IsSelTableCells() ) if( IsSelTableCells() )
m_aSelTableLink.Call(this); m_aSelTableLink.Call(*this);
return 1; return 1;
} }
...@@ -795,7 +795,7 @@ long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool ) ...@@ -795,7 +795,7 @@ long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool )
LeaveExtSel(); LeaveExtSel();
if( IsSelTableCells() ) if( IsSelTableCells() )
m_aSelTableLink.Call(this); m_aSelTableLink.Call(*this);
EndSelect(); EndSelect();
return 1; return 1;
} }
......
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