From 48595c805dd5b917e9bd01ad1c2deb4a047c5f7b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 5 Oct 2019 18:36:38 +0100 Subject: Related: tdf#127935 set default activate handler to toggle row expansion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2bbfb1445b8d2e748f642cdf4723d41b7f072e2b Reviewed-on: https://gerrit.libreoffice.org/80305 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dbaccess/source/ui/dlg/CollectionView.cxx | 4 +++- dbaccess/source/ui/dlg/adtabdlg.cxx | 3 ++- dbaccess/source/ui/dlg/dsselect.cxx | 3 ++- dbaccess/source/ui/dlg/dsselect.hxx | 2 +- dbaccess/source/ui/inc/CollectionView.hxx | 2 +- dbaccess/source/ui/inc/WColumnSelect.hxx | 2 +- dbaccess/source/ui/inc/adtabdlg.hxx | 2 +- dbaccess/source/ui/misc/WColumnSelect.cxx | 4 +++- 8 files changed, 14 insertions(+), 8 deletions(-) (limited to 'dbaccess/source/ui') diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 14f942902e9d..a55badb43b28 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -226,7 +226,7 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click, weld::Button&, void) } } -IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, weld::TreeView&, void) +IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, weld::TreeView&, bool) { try { @@ -252,6 +252,8 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, weld::TreeView&, void) { DBG_UNHANDLED_EXCEPTION("dbaccess"); } + + return true; } void OCollectionView::initCurrentPath() diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 9cb22f5fbb10..e69987042145 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -407,7 +407,7 @@ IMPL_LINK_NOARG( OAddTableDlg, AddClickHdl, weld::Button&, void ) TableListDoubleClickHdl(m_xTableList->GetWidget()); } -IMPL_LINK_NOARG(OAddTableDlg, TableListDoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OAddTableDlg, TableListDoubleClickHdl, weld::TreeView&, bool) { if ( impl_isAddAllowed() ) { @@ -421,6 +421,7 @@ IMPL_LINK_NOARG(OAddTableDlg, TableListDoubleClickHdl, weld::TreeView&, void) if ( !impl_isAddAllowed() ) m_xDialog->response(RET_CLOSE); } + return true; } IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl, weld::TreeView&, void ) diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index c7eee5b6fba5..e9e5aa2ed98e 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -65,10 +65,11 @@ ODatasourceSelectDialog::~ODatasourceSelectDialog() { } -IMPL_LINK(ODatasourceSelectDialog, ListDblClickHdl, weld::TreeView&, rListBox, void) +IMPL_LINK(ODatasourceSelectDialog, ListDblClickHdl, weld::TreeView&, rListBox, bool) { if (rListBox.n_children()) m_xDialog->response(RET_OK); + return true; } short ODatasourceSelectDialog::run() diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index b27693a70c18..2f2322de1f38 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -57,7 +57,7 @@ public: virtual short run() override; private: - DECL_LINK( ListDblClickHdl, weld::TreeView&, void ); + DECL_LINK( ListDblClickHdl, weld::TreeView&, bool ); #ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK(ManageClickHdl, weld::Button&, void); DECL_LINK(ManageProcessFinished, void*, void); diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 949e60b749ec..4dd484f24e9b 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -47,7 +47,7 @@ namespace dbaui DECL_LINK(Up_Click, weld::Button&, void); DECL_LINK(NewFolder_Click, weld::Button&, void); DECL_LINK(Save_Click, weld::Button&, void); - DECL_LINK(Dbl_Click_FileView, weld::TreeView&, void); + DECL_LINK(Dbl_Click_FileView, weld::TreeView&, bool); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index e024a0742e2b..59ebc0ae81a4 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -40,7 +40,7 @@ namespace dbaui std::unique_ptr m_xNewColumnNames; // right side DECL_LINK( ButtonClickHdl, weld::Button&, void ); - DECL_LINK( ListDoubleClickHdl, weld::TreeView&, void ); + DECL_LINK( ListDoubleClickHdl, weld::TreeView&, bool ); static void clearListBox(weld::TreeView& _rListBox); static void fillColumns(weld::TreeView const * pRight, diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 1c87f218b717..bad72a5f6830 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -69,7 +69,7 @@ namespace dbaui DECL_LINK( AddClickHdl, weld::Button&, void ); DECL_LINK( CloseClickHdl, weld::Button&, void); - DECL_LINK( TableListDoubleClickHdl, weld::TreeView&, void ); + DECL_LINK( TableListDoubleClickHdl, weld::TreeView&, bool ); DECL_LINK( TableListSelectHdl, weld::TreeView&, void ); DECL_LINK( OnTypeSelected, weld::Button&, void ); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index d137ef8ea7a7..077e01049767 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -226,7 +226,7 @@ IMPL_LINK(OWizColumnSelect, ButtonClickHdl, weld::Button&, rButton, void) m_xOrgColumnNames->select(0); } -IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, weld::TreeView&, rListBox, void ) +IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, weld::TreeView&, rListBox, bool ) { weld::TreeView *pLeft,*pRight; if (&rListBox == m_xOrgColumnNames.get()) @@ -259,6 +259,8 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, weld::TreeView&, rListBox, void pLeft->remove(*it); enableButtons(); + + return true; } void OWizColumnSelect::clearListBox(weld::TreeView& rListBox) -- cgit