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

convert Link<> to typed

Change-Id: I39a0b4d5fb62ae66926148103b396578ed37405d
üst a9bb16e8
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog
{ {
public: public:
virtual void SetApplyHdl( const Link<>& rLink ) = 0; virtual void SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) = 0;
}; };
class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
......
...@@ -167,7 +167,7 @@ IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) ...@@ -167,7 +167,7 @@ IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void)
m_aHandler.Call(NULL); m_aHandler.Call(NULL);
} }
void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<>& rLink ) void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<LinkParamNone*,void>& rLink )
{ {
m_aHandler = rLink; m_aHandler = rLink;
pDlg->SetApplyHandler(LINK(this, AbstractApplyTabDialog_Impl, ApplyHdl)); pDlg->SetApplyHandler(LINK(this, AbstractApplyTabDialog_Impl, ApplyHdl));
......
...@@ -133,8 +133,8 @@ public: ...@@ -133,8 +133,8 @@ public:
} }
DECL_LINK_TYPED(ApplyHdl, Button*, void); DECL_LINK_TYPED(ApplyHdl, Button*, void);
private: private:
Link<> m_aHandler; Link<LinkParamNone*,void> m_aHandler;
virtual void SetApplyHdl( const Link<>& rLink ) override; virtual void SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) override;
}; };
class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
......
...@@ -515,7 +515,7 @@ public: ...@@ -515,7 +515,7 @@ public:
, m_bModified(bModified) , m_bModified(bModified)
{ {
} }
DECL_LINK( ApplyHdl, void* ); DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void );
void apply() void apply()
{ {
ApplyHdl(NULL); ApplyHdl(NULL);
...@@ -533,7 +533,7 @@ private: ...@@ -533,7 +533,7 @@ private:
bool m_bModified; bool m_bModified;
}; };
IMPL_LINK_NOARG(ApplyStyle, ApplyHdl) IMPL_LINK_NOARG_TYPED(ApplyStyle, ApplyHdl, LinkParamNone*, void)
{ {
SwWrtShell* pWrtShell = m_rDocSh.GetWrtShell(); SwWrtShell* pWrtShell = m_rDocSh.GetWrtShell();
SwDoc* pDoc = m_rDocSh.GetDoc(); SwDoc* pDoc = m_rDocSh.GetDoc();
...@@ -611,8 +611,6 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl) ...@@ -611,8 +611,6 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
} }
pWrtShell->EndAllAction(); pWrtShell->EndAllAction();
return m_nRet;
} }
sal_uInt16 SwDocShell::Edit( sal_uInt16 SwDocShell::Edit(
......
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