diff options
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 3 | ||||
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 5 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 6 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.hxx | 4 |
6 files changed, 12 insertions, 10 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 513d02050679..30e76024218b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -209,10 +209,11 @@ namespace dbp } } - IMPL_LINK(OTableSelectionPage, OnListboxDoubleClicked, weld::TreeView&, _rBox, void) + IMPL_LINK(OTableSelectionPage, OnListboxDoubleClicked, weld::TreeView&, _rBox, bool) { if (_rBox.count_selected_rows()) getDialog()->travelNext(); + return true; } IMPL_LINK(OTableSelectionPage, OnListboxSelection, weld::TreeView&, _rBox, void) diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 08ddd560ab84..5d93b9301271 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -50,7 +50,7 @@ namespace dbp virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; DECL_LINK( OnListboxSelection, weld::TreeView&, void ); - DECL_LINK( OnListboxDoubleClicked, weld::TreeView&, void ); + DECL_LINK( OnListboxDoubleClicked, weld::TreeView&, bool ); DECL_LINK( OnSearchClicked, weld::Button&, void ); void implFillTables(const css::uno::Reference< css::sdbc::XConnection >& diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index f64897ca534c..3f979332a1da 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -366,13 +366,12 @@ namespace dbp getDialog()->enableButtons(WizardButtonFlags::FINISH, 0 != m_xSelFields->n_children()); } - IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, weld::TreeView&, rList, void) + IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, weld::TreeView&, rList, bool) { weld::Button* pSimulateButton = m_xExistFields.get() == &rList ? m_xSelectOne.get() : m_xDeselectOne.get(); if (pSimulateButton->get_sensitive()) - { OnMoveOneEntry(*pSimulateButton); - } + return true; } IMPL_LINK_NOARG(OGridFieldsSelection, OnEntrySelected, weld::TreeView&, void) diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index c8258cd88b2d..5eb9732bd6fd 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -94,7 +94,7 @@ namespace dbp DECL_LINK(OnMoveOneEntry, weld::Button&, void); DECL_LINK(OnMoveAllEntries, weld::Button&, void); DECL_LINK(OnEntrySelected, weld::TreeView&, void); - DECL_LINK(OnEntryDoubleClicked, weld::TreeView&, void); + DECL_LINK(OnEntryDoubleClicked, weld::TreeView&, bool); void implCheckButtons(); }; diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 8192180e9c1a..a1440f2468a3 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -292,10 +292,11 @@ namespace dbp updateDialogTravelUI(); } - IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, weld::TreeView&, _rListBox, void ) + IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, weld::TreeView&, _rListBox, bool ) { if (_rListBox.count_selected_rows()) getDialog()->travelNext(); + return true; } void OContentTableSelection::initializePage() @@ -369,10 +370,11 @@ namespace dbp return 0 != m_xSelectTableField->count_selected_rows(); } - IMPL_LINK_NOARG( OContentFieldSelection, OnTableDoubleClicked, weld::TreeView&, void ) + IMPL_LINK_NOARG( OContentFieldSelection, OnTableDoubleClicked, weld::TreeView&, bool ) { if (m_xSelectTableField->count_selected_rows()) getDialog()->travelNext(); + return true; } IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, weld::TreeView&, void ) diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index d01d270f858b..6fad3011006b 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -109,7 +109,7 @@ namespace dbp virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; virtual bool canAdvance() const override; - DECL_LINK( OnTableDoubleClicked, weld::TreeView&, void ); + DECL_LINK( OnTableDoubleClicked, weld::TreeView&, bool ); DECL_LINK( OnTableSelected, weld::TreeView&, void ); }; @@ -125,7 +125,7 @@ namespace dbp private: DECL_LINK( OnFieldSelected, weld::TreeView&, void ); - DECL_LINK( OnTableDoubleClicked, weld::TreeView&, void ); + DECL_LINK( OnTableDoubleClicked, weld::TreeView&, bool ); // OWizardPage overridables virtual void initializePage() override; |