summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-17 12:44:05 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 14:41:57 +0200
commit50b1184600abf47ac56b539489c166e63b7b544e (patch)
tree2f59e9fc4e891acca8be5d8cd71f21bc2dd6cf1d /cui
parenta86bc66f26cb85e132492d3e826ff396627769cc (diff)
convert Link<> to typed
Change-Id: I2ceffbec44facc4b40c69ebb3f6d52f181bf0177
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/dlgname.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx12
-rw-r--r--cui/source/factory/dlgfact.hxx4
-rw-r--r--cui/source/inc/dlgname.hxx12
4 files changed, 16 insertions, 16 deletions
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index c0f4ce69d054..4a064ebe0135 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -61,7 +61,7 @@ void SvxNameDialog::dispose()
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
{
if(aCheckNameHdl.IsSet())
- pBtnOK->Enable(aCheckNameHdl.Call(this) > 0);
+ pBtnOK->Enable(aCheckNameHdl.Call(*this));
return 0;
}
@@ -103,7 +103,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
{
if(aCheckNameHdl.IsSet())
{
- pBtnOK->Enable(aCheckNameHdl.Call(this) > 0);
+ pBtnOK->Enable(aCheckNameHdl.Call(*this));
}
return 0;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 4493bacd4293..d754caa86f81 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -593,7 +593,7 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bChe
if( rLink.IsSet() )
pDlg->SetCheckNameHdl( LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl), bCheckImmediately );
else
- pDlg->SetCheckNameHdl( Link<>(), bCheckImmediately );
+ pDlg->SetCheckNameHdl( Link<SvxNameDialog&,bool>(), bCheckImmediately );
}
void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId)
{
@@ -607,11 +607,11 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl)
+IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool)
{
if( aCheckNameHdl.IsSet() )
return aCheckNameHdl.Call(this);
- return 0;
+ return false;
}
void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
@@ -629,18 +629,18 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<>& rLink, bool
}
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())
{
return aCheckNameHdl.Call(this);
}
- return 0;
+ return false;
}
void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(OUString& rTitle)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 42d96011a067..7e36ffe3c720 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -332,7 +332,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ;
private:
Link<> aCheckNameHdl;
- DECL_LINK(CheckNameHdl, void *);
+ DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool);
};
class SvxObjectNameDialog;
@@ -346,7 +346,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
private:
Link<> aCheckNameHdl;
- DECL_LINK(CheckNameHdl, void *);
+ DECL_LINK_TYPED(CheckNameHdl, SvxObjectNameDialog&, bool);
};
class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 567988d1680e..b2ae829747aa 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -34,7 +34,7 @@ private:
VclPtr<Edit> pEdtName;
VclPtr<OKButton> pBtnOK;
- Link<> aCheckNameHdl;
+ Link<SvxNameDialog&,bool> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *);
@@ -60,11 +60,11 @@ public:
@todo Remove the parameter bCheckImmediately and incorporate the 'true'
behaviour as default.
*/
- void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false )
+ void SetCheckNameHdl( const Link<SvxNameDialog&,bool>& rLink, bool bCheckImmediately = false )
{
aCheckNameHdl = rLink;
if ( bCheckImmediately )
- pBtnOK->Enable( rLink.Call( this ) > 0 );
+ pBtnOK->Enable( rLink.Call( *this ) );
}
void SetEditHelpId( const OString& aHelpId) {pEdtName->SetHelpId(aHelpId);}
@@ -83,7 +83,7 @@ private:
VclPtr<OKButton> pBtnOK;
// callback link for name uniqueness
- Link<> aCheckNameHdl;
+ Link<SvxObjectNameDialog&,bool> aCheckNameHdl;
DECL_LINK(ModifyHdl, void *);
@@ -97,13 +97,13 @@ public:
void GetName(OUString& rName) {rName = pEdtName->GetText(); }
// set handler
- void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false)
+ void SetCheckNameHdl(const Link<SvxObjectNameDialog&,bool>& rLink, bool bCheckImmediately = false)
{
aCheckNameHdl = rLink;
if(bCheckImmediately)
{
- pBtnOK->Enable(rLink.Call(this) > 0);
+ pBtnOK->Enable(rLink.Call(*this));
}
}
};