diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 16:10:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:34 +0200 |
| commit | 1e2119fd0211b671cad7ba7005a99a1da1a0caf5 (patch) | |
| tree | c4298af25e9a082066ad98a69c5c6c281a360ac5 /dbaccess | |
| parent | f4f05ab199101b9f11718ddc82e139815c1fc521 (diff) | |
convert Link<> to typed
Change-Id: I3d35a0bb75b6989dd13371543d1bdf3ef5f47641
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/dsselect.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dsselect.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/WColumnSelect.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WColumnSelect.cxx | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index ac120a40723c..2a3089cc9279 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -84,11 +84,10 @@ void ODatasourceSelectDialog::dispose() } -IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox *, pListBox ) +IMPL_LINK_TYPED( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void ) { - if (pListBox->GetSelectEntryCount()) + if (rListBox.GetSelectEntryCount()) EndDialog(RET_OK); - return 0; } bool ODatasourceSelectDialog::Close() diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 842047f8c76e..8d8c6112c9c7 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -61,7 +61,7 @@ public: virtual bool Close() SAL_OVERRIDE; protected: - DECL_LINK( ListDblClickHdl, ListBox * ); + DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); #ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK_TYPED(ManageClickHdl, Button*, void); DECL_LINK_TYPED( ManageProcessFinished, void*, void ); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index edf527f2f5b1..b40dbf5ec093 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -43,7 +43,7 @@ namespace dbaui VclPtr<ListBox> m_pNewColumnNames; // right side DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); - DECL_LINK( ListDoubleClickHdl, ListBox * ); + DECL_LINK_TYPED( ListDoubleClickHdl, ListBox&, void ); static void clearListBox(ListBox& _rListBox); static void fillColumns( ListBox* pRight, diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 7167141f2513..c9212bc6312b 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -246,10 +246,10 @@ IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) m_pOrgColumnNames->SelectEntryPos(0); } -IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox ) +IMPL_LINK_TYPED( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) { ListBox *pLeft,*pRight; - if(pListBox == m_pOrgColumnNames) + if(&rListBox == m_pOrgColumnNames) { pLeft = m_pOrgColumnNames; pRight = m_pNewColumnNames; @@ -275,7 +275,6 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox ) pLeft->RemoveEntry(pLeft->GetSelectEntry(--j)); enableButtons(); - return 0; } void OWizColumnSelect::clearListBox(ListBox& _rListBox) |