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

convert Link<> to typed

Change-Id: Ia7bdaa3a02af8f81884d81d60c0f135af2f8aeae
üst 60df720f
...@@ -170,13 +170,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPFilter: public TabPage ...@@ -170,13 +170,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPFilter: public TabPage
{ {
private: private:
Link<> aReadyLink; Link<SvxTPFilter*,void> aReadyLink;
Link<> aModifyLink; Link<SvxTPFilter*,void> aRefLink;
Link<> aModifyDateLink;
Link<> aModifyAuthorLink;
Link<> aModifyRefLink;
Link<> aRefLink;
Link<> aModifyComLink;
VclPtr<SvxRedlinTable> pRedlinTable; VclPtr<SvxRedlinTable> pRedlinTable;
VclPtr<CheckBox> m_pCbDate; VclPtr<CheckBox> m_pCbDate;
...@@ -197,7 +192,7 @@ private: ...@@ -197,7 +192,7 @@ private:
VclPtr<ListBox> m_pLbAction; VclPtr<ListBox> m_pLbAction;
VclPtr<CheckBox> m_pCbComment; VclPtr<CheckBox> m_pCbComment;
VclPtr<Edit> m_pEdComment; VclPtr<Edit> m_pEdComment;
bool bModified; bool bModified;
DECL_LINK( SelDateHdl, ListBox* ); DECL_LINK( SelDateHdl, ListBox* );
DECL_LINK_TYPED( RowEnableHdl, Button*, void ); DECL_LINK_TYPED( RowEnableHdl, Button*, void );
...@@ -264,11 +259,11 @@ public: ...@@ -264,11 +259,11 @@ public:
ListBox* GetLbAction() { return m_pLbAction;} ListBox* GetLbAction() { return m_pLbAction;}
void SetReadyHdl( const Link<>& rLink ) { aReadyLink= rLink; } void SetReadyHdl( const Link<SvxTPFilter*,void>& rLink ) { aReadyLink= rLink; }
// Methods for Calc { // Methods for Calc {
void SetRefHdl( const Link<>& rLink ) { aRefLink = rLink; } void SetRefHdl( const Link<SvxTPFilter*,void>& rLink ) { aRefLink = rLink; }
void Enable( bool bEnable = true, bool bChild = true ); void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true ); void Disable( bool bChild = true );
......
...@@ -97,8 +97,8 @@ private: ...@@ -97,8 +97,8 @@ private:
void Init(); void Init();
void InitFilter(); void InitFilter();
DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void );
DECL_LINK( RefHandle, void* ); DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void );
DECL_LINK( RejectHandle, SvxTPView*); DECL_LINK( RejectHandle, SvxTPView*);
DECL_LINK( AcceptHandle, SvxTPView*); DECL_LINK( AcceptHandle, SvxTPView*);
DECL_LINK( RejectAllHandle, void*); DECL_LINK( RejectAllHandle, void*);
......
...@@ -60,9 +60,9 @@ private: ...@@ -60,9 +60,9 @@ private:
void Init(); void Init();
DECL_LINK( RefHandle, SvxTPFilter* ); DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void );
DECL_LINK_TYPED(HighlightHandle, Button*, void); DECL_LINK_TYPED( HighlightHandle, Button*, void );
DECL_LINK_TYPED(OKBtnHdl, Button*, void); DECL_LINK_TYPED( OKBtnHdl, Button*, void );
protected: protected:
......
...@@ -864,7 +864,7 @@ void ScAcceptChgDlg::UpdateView() ...@@ -864,7 +864,7 @@ void ScAcceptChgDlg::UpdateView()
pTheView->Select(pEntry); pTheView->Select(pEntry);
} }
IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void)
{ {
sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId();
...@@ -888,7 +888,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) ...@@ -888,7 +888,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle)
pWin->SetText(GetText()); pWin->SetText(GetText());
pWnd->StartRefInput(); pWnd->StartRefInput();
} }
return 0;
} }
IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
...@@ -925,7 +924,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) ...@@ -925,7 +924,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
return 0; return 0;
} }
IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef ) IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void )
{ {
if(pRef!=NULL) if(pRef!=NULL)
{ {
...@@ -934,7 +933,6 @@ IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef ) ...@@ -934,7 +933,6 @@ IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef )
aRangeList.Parse(pTPFilter->GetRange(),pDoc); aRangeList.Parse(pTPFilter->GetRange(),pDoc);
UpdateView(); UpdateView();
} }
return 0;
} }
IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
......
...@@ -202,7 +202,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) ...@@ -202,7 +202,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void )
} }
} }
IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) IMPL_LINK_TYPED( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef, void )
{ {
if(pRef!=NULL) if(pRef!=NULL)
{ {
...@@ -213,7 +213,6 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) ...@@ -213,7 +213,6 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef )
m_pEdAssign->GrabFocus(); m_pEdAssign->GrabFocus();
ScAnyRefDlg::RefInputStart(m_pEdAssign, m_pRbAssign); ScAnyRefDlg::RefInputStart(m_pEdAssign, m_pRbAssign);
} }
return 0;
} }
IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void )
......
...@@ -971,30 +971,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr) ...@@ -971,30 +971,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
{ {
if(pCtr!=NULL) if(pCtr!=NULL)
{ {
if (pCtr == m_pCbDate || pCtr == m_pLbDate ||
pCtr == m_pDfDate || pCtr == m_pTfDate ||
pCtr == m_pIbClock || pCtr == m_pFtDate2 ||
pCtr == m_pDfDate2 || pCtr == m_pTfDate2 ||
pCtr == m_pIbClock2)
{
aModifyDateLink.Call(this);
}
else if (pCtr == m_pCbAuthor || pCtr == m_pLbAuthor)
{
aModifyAuthorLink.Call(this);
}
else if (pCtr == m_pCbRange || pCtr == m_pLbAction || pCtr == m_pEdRange ||
pCtr == m_pBtnRange)
{
aModifyRefLink.Call(this);
}
else if (pCtr == m_pCbComment || pCtr == m_pEdComment)
{
aModifyComLink.Call(this);
}
bModified=true; bModified=true;
aModifyLink.Call(this);
} }
return 0; return 0;
} }
......
...@@ -82,7 +82,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( bool bAccept ) ...@@ -82,7 +82,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( bool bAccept )
pFilterTP->CheckAuthor(false); pFilterTP->CheckAuthor(false);
pFilterTP->CheckRange(false); pFilterTP->CheckRange(false);
pFilterTP->CheckAction(false); pFilterTP->CheckAction(false);
pImplDlg->FilterChangedHdl(); pImplDlg->FilterChangedHdl(NULL);
} }
pImplDlg->CallAcceptReject( false, bAccept ); pImplDlg->CallAcceptReject( false, bAccept );
......
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false);
virtual ~SwRedlineAcceptDlg(); virtual ~SwRedlineAcceptDlg();
DECL_LINK( FilterChangedHdl, void * = 0 ); DECL_LINK_TYPED( FilterChangedHdl, SvxTPFilter*, void );
inline SvxAcceptChgCtr& GetChgCtrl() { return *aTabPagesCTRL.get(); } inline SvxAcceptChgCtr& GetChgCtrl() { return *aTabPagesCTRL.get(); }
inline bool HasRedlineAutoFormat() const { return bRedlnAutoFormat; } inline bool HasRedlineAutoFormat() const { return bRedlnAutoFormat; }
......
...@@ -919,7 +919,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl) ...@@ -919,7 +919,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl)
return 0; return 0;
} }
IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl) IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void)
{ {
SvxTPFilter *pFilterTP = aTabPagesCTRL->GetFilterPage(); SvxTPFilter *pFilterTP = aTabPagesCTRL->GetFilterPage();
...@@ -929,8 +929,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl) ...@@ -929,8 +929,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl)
sFilterAction = aEmptyOUStr; sFilterAction = aEmptyOUStr;
Init(); Init();
return 0;
} }
IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void)
......
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