diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 22:43:11 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 08:20:55 +0200 |
commit | b515d1f36fdf8c242079da60eb4ecd5fd456583c (patch) | |
tree | f26dd6feb936ddec4799bed60d4966d46acff938 /dbaccess | |
parent | f593be5bcde09965bb3478e00bcdedbc6bd5bc57 (diff) |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/indexdialog.hxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index fade1cf5f1f1..4b72d59c3ed7 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1150,7 +1150,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, } } -IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/) +IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) { m_aTBPreview->EndSelection(); @@ -1192,7 +1192,6 @@ IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/) Resize(); getBorderWin().getView()->getAppController().executeChecked(nSelectedAction,Sequence<PropertyValue>()); } - return 0L; } void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt ) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index b955472dd157..8c75918a2a62 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -161,7 +161,7 @@ namespace dbaui DECL_LINK(PreviewChangeHdl, void*); // click a TB slot - DECL_LINK(OnDropdownClickHdl, ToolBox*); + DECL_LINK_TYPED(OnDropdownClickHdl, ToolBox*, void); inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } void ImplInitSettings(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index bfb41ce1da4c..dea680bfd952 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -544,7 +544,7 @@ namespace dbaui updateToolbox(); } - IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnIndexAction, ToolBox*, void ) { sal_uInt16 nClicked = m_pActions->GetCurItemId(); if (nClicked == mnNewCmdId) @@ -557,8 +557,6 @@ namespace dbaui OnSaveIndex(); else if (nClicked == mnResetCmdId) OnResetIndex(); - - return 0L; } IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index a1928d4acd99..c4cc5c620a90 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -131,7 +131,7 @@ namespace dbaui protected: DECL_LINK( OnIndexSelected, DbaIndexList* ); - DECL_LINK( OnIndexAction, ToolBox* ); + DECL_LINK_TYPED( OnIndexAction, ToolBox*, void ); DECL_LINK( OnEntryEdited, SvTreeListEntry* ); DECL_LINK( OnModified, void* ); DECL_LINK( OnCloseDialog, void* ); |