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

convert Link<> to typed

Change-Id: I22f995b905e7abf1451a0636083bf19b3f2d9bc4
üst b6e95a8c
...@@ -154,10 +154,9 @@ void WebConnectionInfoDialog::dispose() ...@@ -154,10 +154,9 @@ void WebConnectionInfoDialog::dispose()
ModalDialog::dispose(); ModalDialog::dispose();
} }
IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable ) IMPL_LINK_TYPED( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void )
{ {
m_pPasswordsLB->Resort( NULL == pTable ); m_pPasswordsLB->Resort( NULL == pTable );
return 0;
} }
......
...@@ -50,13 +50,13 @@ namespace svx ...@@ -50,13 +50,13 @@ namespace svx
VclPtr<PushButton> m_pChangeBtn; VclPtr<PushButton> m_pChangeBtn;
sal_Int32 m_nPos; sal_Int32 m_nPos;
DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* ); DECL_LINK_TYPED( HeaderBarClickedHdl, SvSimpleTable*, void );
DECL_LINK_TYPED(RemovePasswordHdl, Button*, void); DECL_LINK_TYPED( RemovePasswordHdl, Button*, void );
DECL_LINK_TYPED(RemoveAllPasswordsHdl, Button*, void); DECL_LINK_TYPED( RemoveAllPasswordsHdl, Button*, void );
DECL_LINK_TYPED(ChangePasswordHdl, Button*, void); DECL_LINK_TYPED( ChangePasswordHdl, Button*, void );
DECL_LINK( EntrySelectedHdl, void* ); DECL_LINK( EntrySelectedHdl, void* );
void FillPasswordList(); void FillPasswordList();
public: public:
explicit WebConnectionInfoDialog( vcl::Window* pParent ); explicit WebConnectionInfoDialog( vcl::Window* pParent );
......
...@@ -51,9 +51,8 @@ class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox ...@@ -51,9 +51,8 @@ class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox
private: private:
SvSimpleTableContainer& m_rParentTableContainer; SvSimpleTableContainer& m_rParentTableContainer;
Link<> aHeaderBarClickLink; Link<SvSimpleTable*, void> aHeaderBarClickLink;
Link<> aHeaderBarDblClickLink; Link<SvSimpleTable*, void> aCommandLink;
Link<> aCommandLink;
CommandEvent aCEvt; CommandEvent aCEvt;
VclPtr<HeaderBar> aHeaderBar; VclPtr<HeaderBar> aHeaderBar;
long nOldPos; long nOldPos;
...@@ -68,7 +67,6 @@ private: ...@@ -68,7 +67,6 @@ private:
DECL_LINK_TYPED( DragHdl, HeaderBar*, void ); DECL_LINK_TYPED( DragHdl, HeaderBar*, void );
DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void ); DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void );
DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void );
DECL_LINK_TYPED( HeaderBarDblClick, HeaderBar*, void );
DECL_LINK( CompareHdl, SvSortData* ); DECL_LINK( CompareHdl, SvSortData* );
protected: protected:
...@@ -79,7 +77,6 @@ protected: ...@@ -79,7 +77,6 @@ protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void HBarClick(); virtual void HBarClick();
void HBarDblClick();
void HBarStartDrag(); void HBarStartDrag();
void HBarDrag(); void HBarDrag();
void HBarEndDrag(); void HBarEndDrag();
...@@ -119,9 +116,9 @@ public: ...@@ -119,9 +116,9 @@ public:
CommandEvent GetCommandEvent()const { return aCEvt;} CommandEvent GetCommandEvent()const { return aCEvt;}
inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
void SetCommandHdl( const Link<>& rLink ) { aCommandLink = rLink; } void SetCommandHdl( const Link<SvSimpleTable*,void>& rLink ) { aCommandLink = rLink; }
void SetHeaderBarClickHdl( const Link<>& rLink ) { aHeaderBarClickLink = rLink; } void SetHeaderBarClickHdl( const Link<SvSimpleTable*,void>& rLink ) { aHeaderBarClickLink = rLink; }
HeaderBar& GetTheHeaderBar() { return *aHeaderBar.get(); } HeaderBar& GetTheHeaderBar() { return *aHeaderBar.get(); }
}; };
......
...@@ -109,7 +109,7 @@ private: ...@@ -109,7 +109,7 @@ private:
DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
DECL_LINK( ChgTrackModHdl, ScChangeTrack*); DECL_LINK( ChgTrackModHdl, ScChangeTrack*);
DECL_LINK( CommandHdl, void*); DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void);
DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void ); DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void );
DECL_LINK( ColCompareHdl, SvSortData*); DECL_LINK( ColCompareHdl, SvSortData*);
......
...@@ -1691,7 +1691,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) ...@@ -1691,7 +1691,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void)
pTPView->EnableReject( bRejectFlag && bEnable ); pTPView->EnableReject( bRejectFlag && bEnable );
} }
IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void)
{ {
const CommandEvent aCEvt(pTheView->GetCommandEvent()); const CommandEvent aCEvt(pTheView->GetCommandEvent());
...@@ -1775,7 +1775,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) ...@@ -1775,7 +1775,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl)
} }
} }
} }
return 0;
} }
void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
......
...@@ -104,7 +104,6 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits): ...@@ -104,7 +104,6 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits):
aHeaderBar->SetDragHdl(LINK( this, SvSimpleTable, DragHdl)); aHeaderBar->SetDragHdl(LINK( this, SvSimpleTable, DragHdl));
aHeaderBar->SetEndDragHdl(LINK( this, SvSimpleTable, EndDragHdl)); aHeaderBar->SetEndDragHdl(LINK( this, SvSimpleTable, EndDragHdl));
aHeaderBar->SetSelectHdl(LINK( this, SvSimpleTable, HeaderBarClick)); aHeaderBar->SetSelectHdl(LINK( this, SvSimpleTable, HeaderBarClick));
aHeaderBar->SetDoubleClickHdl(LINK( this, SvSimpleTable, HeaderBarDblClick));
EnableCellFocus(); EnableCellFocus();
...@@ -334,11 +333,6 @@ void SvSimpleTable::HBarClick() ...@@ -334,11 +333,6 @@ void SvSimpleTable::HBarClick()
} }
} }
void SvSimpleTable::HBarDblClick()
{
aHeaderBarDblClickLink.Call(this);
}
void SvSimpleTable::HBarStartDrag() void SvSimpleTable::HBarStartDrag()
{ {
if(!aHeaderBar->IsItemMode()) if(!aHeaderBar->IsItemMode())
...@@ -426,14 +420,6 @@ IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) ...@@ -426,14 +420,6 @@ IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void)
} }
} }
IMPL_LINK_TYPED( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr, void)
{
if(pCtr==aHeaderBar.get())
{
HBarDblClick();
}
}
SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const
{ {
DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
......
...@@ -97,9 +97,9 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg ...@@ -97,9 +97,9 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
DECL_DLLPRIVATE_LINK( SelectHdl, void* ); DECL_DLLPRIVATE_LINK( SelectHdl, void* );
DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void ); DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void );
DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void ); DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( CommandHdl, void* ); DECL_DLLPRIVATE_LINK_TYPED( CommandHdl, SvSimpleTable*, void );
SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild); SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild);
SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat); SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat);
SAL_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX); SAL_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
SAL_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd); SAL_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
...@@ -125,7 +125,7 @@ public: ...@@ -125,7 +125,7 @@ public:
void Initialize(const OUString &rExtraData); void Initialize(const OUString &rExtraData);
void FillInfo(OUString &rExtraData) const; void FillInfo(OUString &rExtraData) const;
void Activate(); void Activate();
}; };
class SwModelessRedlineAcceptDlg : public SfxModelessDialog class SwModelessRedlineAcceptDlg : public SfxModelessDialog
......
...@@ -1020,7 +1020,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) ...@@ -1020,7 +1020,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void)
pTPView->EnableRejectAll( bEnable && !bOnlyFormatedRedlines && !bHasReadonlySel ); pTPView->EnableRejectAll( bEnable && !bOnlyFormatedRedlines && !bHasReadonlySel );
} }
IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void)
{ {
const CommandEvent aCEvt(pTable->GetCommandEvent()); const CommandEvent aCEvt(pTable->GetCommandEvent());
...@@ -1185,8 +1185,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) ...@@ -1185,8 +1185,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
break; break;
default: break; default: break;
} }
return 0;
} }
void SwRedlineAcceptDlg::Initialize(const OUString& rExtraData) void SwRedlineAcceptDlg::Initialize(const OUString& rExtraData)
......
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