summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/namedlg
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/namedlg')
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx6
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx13
-rw-r--r--sc/source/ui/namedlg/namepast.cxx3
3 files changed, 8 insertions, 14 deletions
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 0f80368c5377..9eafd5f40209 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -327,16 +327,14 @@ void ScNameDefDlg::SetActive()
RefInputDone();
}
-IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDefDlg, CancelBtnHdl, Button*, void)
{
CancelPushed();
- return 0;
}
-IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AddBtnHdl, Button*, void)
{
AddPushed();
- return 0;
};
IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl)
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 3b1aa06e89ab..63ae44dca41a 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -483,27 +483,24 @@ void ScNameDlg::GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap)
maRangeMap.swap(rRangeMap);
}
-IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDlg, OkBtnHdl, Button*, void)
{
Close();
- return 0;
}
-IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDlg, CancelBtnHdl, Button*, void)
{
CancelPushed();
- return 0;
}
-IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDlg, AddBtnHdl, Button*, void)
{
- return long(AddPushed());
+ AddPushed();
}
-IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScNameDlg, RemoveBtnHdl, Button*, void)
{
RemovePushed();
- return 0;
}
IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl)
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 5f0c238327ef..7b64fed12108 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -77,7 +77,7 @@ void ScNamePasteDlg::dispose()
ModalDialog::dispose();
}
-IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton )
+IMPL_LINK_TYPED( ScNamePasteDlg, ButtonHdl, Button *, pButton, void )
{
if( pButton == m_pBtnPasteAll )
{
@@ -97,7 +97,6 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton )
{
EndDialog( BTN_PASTE_CLOSE );
}
- return 0;
}
std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const