Kaydet (Commit) 50b11846 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I2ceffbec44facc4b40c69ebb3f6d52f181bf0177
üst a86bc66f
...@@ -61,7 +61,7 @@ void SvxNameDialog::dispose() ...@@ -61,7 +61,7 @@ void SvxNameDialog::dispose()
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
{ {
if(aCheckNameHdl.IsSet()) if(aCheckNameHdl.IsSet())
pBtnOK->Enable(aCheckNameHdl.Call(this) > 0); pBtnOK->Enable(aCheckNameHdl.Call(*this));
return 0; return 0;
} }
...@@ -103,7 +103,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) ...@@ -103,7 +103,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
{ {
if(aCheckNameHdl.IsSet()) if(aCheckNameHdl.IsSet())
{ {
pBtnOK->Enable(aCheckNameHdl.Call(this) > 0); pBtnOK->Enable(aCheckNameHdl.Call(*this));
} }
return 0; return 0;
......
...@@ -593,7 +593,7 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bChe ...@@ -593,7 +593,7 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bChe
if( rLink.IsSet() ) if( rLink.IsSet() )
pDlg->SetCheckNameHdl( LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl), bCheckImmediately ); pDlg->SetCheckNameHdl( LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl), bCheckImmediately );
else else
pDlg->SetCheckNameHdl( Link<>(), bCheckImmediately ); pDlg->SetCheckNameHdl( Link<SvxNameDialog&,bool>(), bCheckImmediately );
} }
void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId) void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId)
{ {
...@@ -607,11 +607,11 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr ) ...@@ -607,11 +607,11 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr )
{ {
pDlg->SetText( rStr ); pDlg->SetText( rStr );
} }
IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl) IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool)
{ {
if( aCheckNameHdl.IsSet() ) if( aCheckNameHdl.IsSet() )
return aCheckNameHdl.Call(this); return aCheckNameHdl.Call(this);
return 0; return false;
} }
void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName) void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
...@@ -629,18 +629,18 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<>& rLink, bool ...@@ -629,18 +629,18 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<>& rLink, bool
} }
else else
{ {
pDlg->SetCheckNameHdl(Link<>(), bCheckImmediately); pDlg->SetCheckNameHdl(Link<SvxObjectNameDialog&,bool>(), bCheckImmediately);
} }
} }
IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl) IMPL_LINK_NOARG_TYPED(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool)
{ {
if(aCheckNameHdl.IsSet()) if(aCheckNameHdl.IsSet())
{ {
return aCheckNameHdl.Call(this); return aCheckNameHdl.Call(this);
} }
return 0; return false;
} }
void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(OUString& rTitle) void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(OUString& rTitle)
......
...@@ -332,7 +332,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog ...@@ -332,7 +332,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ; virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ;
private: private:
Link<> aCheckNameHdl; Link<> aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *); DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool);
}; };
class SvxObjectNameDialog; class SvxObjectNameDialog;
...@@ -346,7 +346,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog ...@@ -346,7 +346,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
private: private:
Link<> aCheckNameHdl; Link<> aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *); DECL_LINK_TYPED(CheckNameHdl, SvxObjectNameDialog&, bool);
}; };
class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog
......
...@@ -34,7 +34,7 @@ private: ...@@ -34,7 +34,7 @@ private:
VclPtr<Edit> pEdtName; VclPtr<Edit> pEdtName;
VclPtr<OKButton> pBtnOK; VclPtr<OKButton> pBtnOK;
Link<> aCheckNameHdl; Link<SvxNameDialog&,bool> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *); DECL_LINK(ModifyHdl, void *);
...@@ -60,11 +60,11 @@ public: ...@@ -60,11 +60,11 @@ public:
@todo Remove the parameter bCheckImmediately and incorporate the 'true' @todo Remove the parameter bCheckImmediately and incorporate the 'true'
behaviour as default. behaviour as default.
*/ */
void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) void SetCheckNameHdl( const Link<SvxNameDialog&,bool>& rLink, bool bCheckImmediately = false )
{ {
aCheckNameHdl = rLink; aCheckNameHdl = rLink;
if ( bCheckImmediately ) if ( bCheckImmediately )
pBtnOK->Enable( rLink.Call( this ) > 0 ); pBtnOK->Enable( rLink.Call( *this ) );
} }
void SetEditHelpId( const OString& aHelpId) {pEdtName->SetHelpId(aHelpId);} void SetEditHelpId( const OString& aHelpId) {pEdtName->SetHelpId(aHelpId);}
...@@ -83,7 +83,7 @@ private: ...@@ -83,7 +83,7 @@ private:
VclPtr<OKButton> pBtnOK; VclPtr<OKButton> pBtnOK;
// callback link for name uniqueness // callback link for name uniqueness
Link<> aCheckNameHdl; Link<SvxObjectNameDialog&,bool> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *); DECL_LINK(ModifyHdl, void *);
...@@ -97,13 +97,13 @@ public: ...@@ -97,13 +97,13 @@ public:
void GetName(OUString& rName) {rName = pEdtName->GetText(); } void GetName(OUString& rName) {rName = pEdtName->GetText(); }
// set handler // set handler
void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) void SetCheckNameHdl(const Link<SvxObjectNameDialog&,bool>& rLink, bool bCheckImmediately = false)
{ {
aCheckNameHdl = rLink; aCheckNameHdl = rLink;
if(bCheckImmediately) if(bCheckImmediately)
{ {
pBtnOK->Enable(rLink.Call(this) > 0); pBtnOK->Enable(rLink.Call(*this));
} }
} }
}; };
......
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