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

convert Link<> to typed

Change-Id: I845f48577a9b93854e24a2004168c2d2311d9542
Reviewed-on: https://gerrit.libreoffice.org/18854Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 51b2ad37
...@@ -176,12 +176,12 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) ...@@ -176,12 +176,12 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev)
IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void)
{ {
aPrevHdlLink.Call( this ); aPrevHdlLink.Call( *this );
} }
IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void) IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void)
{ {
aNextHdlLink.Call( this ); aNextHdlLink.Call( *this );
} }
IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void)
......
...@@ -785,7 +785,7 @@ void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink ) ...@@ -785,7 +785,7 @@ void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink )
if( rLink.IsSet() ) if( rLink.IsSet() )
pDlg->SetNextHdl( LINK(this, AbstractSvxPostItDialog_Impl, NextHdl ) ); pDlg->SetNextHdl( LINK(this, AbstractSvxPostItDialog_Impl, NextHdl ) );
else else
pDlg->SetNextHdl( Link<>() ); pDlg->SetNextHdl( Link<SvxPostItDialog&,void>() );
} }
void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink ) void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink )
{ {
...@@ -793,19 +793,17 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink ) ...@@ -793,19 +793,17 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink )
if( rLink.IsSet() ) if( rLink.IsSet() )
pDlg->SetPrevHdl( LINK(this, AbstractSvxPostItDialog_Impl, PrevHdl ) ); pDlg->SetPrevHdl( LINK(this, AbstractSvxPostItDialog_Impl, PrevHdl ) );
else else
pDlg->SetPrevHdl( Link<>() ); pDlg->SetPrevHdl( Link<SvxPostItDialog&,void>() );
} }
IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl) IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void)
{ {
if( aNextHdl.IsSet() ) if( aNextHdl.IsSet() )
aNextHdl.Call(this); aNextHdl.Call(this);
return 0;
} }
IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl) IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void)
{ {
if( aPrevHdl.IsSet() ) if( aPrevHdl.IsSet() )
aPrevHdl.Call(this); aPrevHdl.Call(this);
return 0;
} }
vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow() vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow()
{ {
......
...@@ -460,8 +460,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog ...@@ -460,8 +460,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
private: private:
Link<> aNextHdl; Link<> aNextHdl;
Link<> aPrevHdl; Link<> aPrevHdl;
DECL_LINK(NextHdl, void *); DECL_LINK_TYPED(NextHdl, SvxPostItDialog&, void);
DECL_LINK(PrevHdl, void *); DECL_LINK_TYPED(PrevHdl, SvxPostItDialog&, void);
}; };
class PasswordToOpenModifyDialog; class PasswordToOpenModifyDialog;
......
...@@ -51,9 +51,9 @@ public: ...@@ -51,9 +51,9 @@ public:
static const sal_uInt16* GetRanges(); static const sal_uInt16* GetRanges();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; } const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
void SetPrevHdl( const Link<>& rLink ) void SetPrevHdl( const Link<SvxPostItDialog&,void>& rLink )
{ aPrevHdlLink = rLink; } { aPrevHdlLink = rLink; }
void SetNextHdl( const Link<>& rLink ) void SetNextHdl( const Link<SvxPostItDialog&,void>& rLink )
{ aNextHdlLink = rLink; } { aNextHdlLink = rLink; }
void EnableTravel(bool bNext, bool bPrev); void EnableTravel(bool bNext, bool bPrev);
...@@ -91,8 +91,8 @@ private: ...@@ -91,8 +91,8 @@ private:
const SfxItemSet& rSet; const SfxItemSet& rSet;
SfxItemSet* pOutSet; SfxItemSet* pOutSet;
Link<> aPrevHdlLink; Link<SvxPostItDialog&,void> aPrevHdlLink;
Link<> aNextHdlLink; Link<SvxPostItDialog&,void> aNextHdlLink;
DECL_LINK_TYPED(Stamp, Button*, void); DECL_LINK_TYPED(Stamp, Button*, void);
DECL_LINK_TYPED(OKHdl, Button*, void); DECL_LINK_TYPED(OKHdl, Button*, 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