summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-10-05 18:36:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-10-06 22:14:17 +0200
commit48595c805dd5b917e9bd01ad1c2deb4a047c5f7b (patch)
treef1dd7b638b78694cd5ac635e0de6be3ca1d13042 /dbaccess/source/ui/dlg
parent4b28b77eddfe48e709180f1ab81ac0d996796471 (diff)
Related: tdf#127935 set default activate handler to toggle row expansion
Change-Id: I2bbfb1445b8d2e748f642cdf4723d41b7f072e2b Reviewed-on: https://gerrit.libreoffice.org/80305 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx2
4 files changed, 8 insertions, 4 deletions
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);