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 --- cui/source/customize/cfg.cxx | 3 ++- cui/source/customize/cfgutil.cxx | 16 ++-------------- cui/source/customize/macropg.cxx | 3 ++- cui/source/dialogs/SpellDialog.cxx | 3 ++- cui/source/dialogs/cuigaldlg.cxx | 3 ++- cui/source/dialogs/hlmarkwn.cxx | 3 ++- cui/source/dialogs/insdlg.cxx | 3 ++- cui/source/dialogs/linkdlg.cxx | 3 ++- cui/source/dialogs/pastedlg.cxx | 3 ++- cui/source/dialogs/thesdlg.cxx | 4 +++- cui/source/inc/SpellDialog.hxx | 2 +- cui/source/inc/autocdlg.hxx | 2 +- cui/source/inc/cfg.hxx | 2 +- cui/source/inc/cfgutil.hxx | 5 ++--- cui/source/inc/cuigaldlg.hxx | 2 +- cui/source/inc/dbregister.hxx | 2 +- cui/source/inc/hlmarkwn.hxx | 2 +- cui/source/inc/insdlg.hxx | 2 +- cui/source/inc/linkdlg.hxx | 2 +- cui/source/inc/macroass.hxx | 2 +- cui/source/inc/macropg.hxx | 2 +- cui/source/inc/numfmt.hxx | 2 +- cui/source/inc/optlingu.hxx | 2 +- cui/source/inc/optpath.hxx | 2 +- cui/source/inc/pastedlg.hxx | 2 +- cui/source/inc/tabstpge.hxx | 2 +- cui/source/inc/thesdlg.hxx | 2 +- cui/source/inc/treeopt.hxx | 1 - cui/source/options/dbregister.cxx | 3 ++- cui/source/options/optaboutconfig.cxx | 3 ++- cui/source/options/optaboutconfig.hxx | 2 +- cui/source/options/optjava.cxx | 3 ++- cui/source/options/optjava.hxx | 2 +- cui/source/options/optlingu.cxx | 3 ++- cui/source/options/optpath.cxx | 3 ++- cui/source/options/treeopt.cxx | 9 --------- cui/source/tabpages/autocdlg.cxx | 3 ++- cui/source/tabpages/macroass.cxx | 5 +++-- cui/source/tabpages/numfmt.cxx | 6 +++--- cui/source/tabpages/tabstpge.cxx | 3 ++- 40 files changed, 61 insertions(+), 66 deletions(-) (limited to 'cui/source') diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 79977a220ab5..b9f08fe53149 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1553,10 +1553,11 @@ IMPL_LINK(SvxConfigPage, MoveHdl, weld::Button&, rButton, void) MoveEntry(&rButton == m_xMoveUpButton.get()); } -IMPL_LINK_NOARG(SvxConfigPage, FunctionDoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxConfigPage, FunctionDoubleClickHdl, weld::TreeView&, bool) { if (m_xAddCommandButton->get_sensitive()) m_xAddCommandButton->clicked(); + return true; } IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, weld::TreeView&, void) diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index ebfc025ea27c..0549e04cfbf5 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -408,23 +408,10 @@ CuiConfigGroupListBox::CuiConfigGroupListBox(std::unique_ptr xTr , m_pStylesInfo(nullptr) , m_xTreeView(std::move(xTreeView)) { - m_xTreeView->connect_row_activated(LINK(this, CuiConfigGroupListBox, OpenCurrentHdl)); m_xTreeView->connect_expanding(LINK(this, CuiConfigGroupListBox, ExpandingHdl)); m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 35, m_xTreeView->get_height_rows(9)); } -IMPL_LINK_NOARG(CuiConfigGroupListBox, OpenCurrentHdl, weld::TreeView&, void) -{ - std::unique_ptr xIter(m_xTreeView->make_iterator()); - bool bValidIter = m_xTreeView->get_cursor(xIter.get()); - if (!bValidIter) - return; - if (!m_xTreeView->get_row_expanded(*xIter)) - m_xTreeView->expand_row(*xIter); - else - m_xTreeView->collapse_row(*xIter); -} - CuiConfigGroupListBox::~CuiConfigGroupListBox() { ClearAll(); @@ -1133,10 +1120,11 @@ IMPL_LINK(SvxScriptSelectorDialog, SelectHdl, weld::TreeView&, rCtrl, void) UpdateUI(); } -IMPL_LINK_NOARG(SvxScriptSelectorDialog, FunctionDoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxScriptSelectorDialog, FunctionDoubleClickHdl, weld::TreeView&, bool) { if (m_xOKButton->get_sensitive()) ClickHdl(*m_xOKButton); + return true; } // Check if command is selected and enable the OK button accordingly diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index b2b3beadb4a8..2fb442dbdb24 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -385,9 +385,10 @@ IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, weld::Button&, rBtn, void ) GenericHandler_Impl(this, &rBtn); } -IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, weld::TreeView&, bool) { GenericHandler_Impl(this, nullptr); + return true; } // handler for double click on the listbox, and for the assign/delete buttons diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index caa9b92291c1..2574dd84a25e 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -498,9 +498,10 @@ OUString SpellDialog::getReplacementString() const return getDotReplacementString(sOrigString, sReplacement); } -IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, weld::TreeView&, bool) { ChangeHdl(*m_xChangePB); + return true; } IMPL_LINK_NOARG(SpellDialog, ChangeHdl, weld::Button&, void) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 660d7b5bf113..acac953f5a36 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -966,7 +966,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, weld::TreeView&, void) } } -IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, weld::TreeView&, bool) { if( bInputAllowed ) { @@ -975,6 +975,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, weld::TreeView&, void) if (m_xLbxFound->count_selected_rows() == 1 && bEntriesFound) ClickTakeHdl(*m_xBtnTake); } + return true; } IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 9589f6087b00..08d1798b42e5 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -411,9 +411,10 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark) } // Click on Apply-Button / Double-click on item in tree -IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, weld::TreeView&, bool) { ClickApplyHdl_Impl(*mxBtApply); + return true; } IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, weld::Button&, void) diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 63169d3664df..948a02d88efa 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -76,9 +76,10 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(weld::Window* pParent, { } -IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, weld::TreeView&, bool) { m_xDialog->response(RET_OK); + return true; } IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&, void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 33f7529516da..f8388ece411c 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -214,9 +214,10 @@ void SvBaseLinksDlg::LinksSelectHdl(weld::TreeView* pSvTabListBox) } } -IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, weld::TreeView&, bool ) { ChangeSourceClickHdl(*m_xPbChangeSource); + return true; } IMPL_LINK_NOARG( SvBaseLinksDlg, AutomaticClickHdl, weld::Button&, void ) diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 3b08dcd5466f..f9d9a76318ab 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -56,9 +56,10 @@ IMPL_LINK_NOARG(SvPasteObjectDialog, SelectHdl, weld::TreeView&, void) m_xOKButton->set_sensitive(true); } -IMPL_LINK_NOARG(SvPasteObjectDialog, DoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvPasteObjectDialog, DoubleClickHdl, weld::TreeView&, bool) { m_xDialog->response(RET_OK); + return true; } /************************************************************************* diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index dcb8805e7a0d..5792d456b702 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -197,7 +197,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, weld::TreeView&, rBox } } -IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, weld::TreeView&, rBox, void ) +IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, weld::TreeView&, rBox, bool ) { int nEntry = rBox.get_selected_index(); if (nEntry != -1) @@ -217,6 +217,8 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, weld::TreeView&, //! workaround to set the selection since calling SelectEntryPos within //! the double click handler does not work Application::PostUserEvent(LINK(this, SvxThesaurusDialog, SelectFirstHdl_Impl)); + + return true; } IMPL_LINK_NOARG(SvxThesaurusDialog, SelectFirstHdl_Impl, void *, void) diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 65de78342f7e..b38880ee5869 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -171,7 +171,7 @@ private: std::unique_ptr m_xSentenceEDWeld; DECL_LINK(ChangeHdl, weld::Button&, void); - DECL_LINK(DoubleClickChangeHdl, weld::TreeView&, void); + DECL_LINK(DoubleClickChangeHdl, weld::TreeView&, bool); DECL_LINK(ChangeAllHdl, weld::Button&, void); DECL_LINK(IgnoreAllHdl, weld::Button&, void); DECL_LINK(IgnoreHdl, weld::Button&, void); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index dbf437dfbe5a..3254573a6d3a 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -114,7 +114,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage DECL_LINK(SelectHdl, weld::TreeView&, void); DECL_LINK(EditHdl, weld::Button&, void); - DECL_LINK(DoubleClickEditHdl, weld::TreeView&, void); + DECL_LINK(DoubleClickEditHdl, weld::TreeView&, bool); void CreateEntry(const OUString& rTxt, sal_uInt16 nCol); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index e360d79f096e..8163387f13e9 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -408,7 +408,7 @@ protected: DECL_LINK(MoveHdl, weld::Button&, void); DECL_LINK(SelectFunctionHdl, weld::TreeView&, void); - DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, void); + DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, bool); DECL_LINK(SelectSaveInLocation, weld::ComboBox&, void); DECL_LINK(SelectElementHdl, weld::ComboBox&, void); DECL_LINK(ImplUpdateDataHdl, Timer*, void); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 331a59a21d8d..e930c24ac3ec 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -111,7 +111,7 @@ public: CuiConfigFunctionListBox(std::unique_ptr xTreeView); void set_sensitive(bool bSensitive) { m_xTreeView->set_sensitive(bSensitive); } void connect_changed(const Link& rLink) { m_xTreeView->connect_changed(rLink); } - void connect_row_activated(const Link& rLink) { m_xTreeView->connect_row_activated(rLink); } + void connect_row_activated(const Link& rLink) { m_xTreeView->connect_row_activated(rLink); } void freeze() { m_xTreeView->freeze(); } void thaw() { m_xTreeView->thaw(); } void append(const OUString& rId, const OUString& rStr, const weld::TreeIter* pParent = nullptr) @@ -208,7 +208,6 @@ class CuiConfigGroupListBox OUString MapCommand2UIName(const OUString& sCommand); DECL_LINK(ExpandingHdl, const weld::TreeIter&, bool); - DECL_LINK(OpenCurrentHdl, weld::TreeView&, void); public: CuiConfigGroupListBox(std::unique_ptr xTreeView); @@ -250,7 +249,7 @@ class SvxScriptSelectorDialog : public weld::GenericDialogController DECL_LINK(ClickHdl, weld::Button&, void); DECL_LINK(SelectHdl, weld::TreeView&, void); - DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, void); + DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, bool); void UpdateUI(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 35142bf1c935..f472d283b2fd 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -256,7 +256,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK(ClickTakeAllHdl, weld::Button&, void); DECL_LINK(SelectFoundHdl, weld::TreeView&, void); DECL_LINK(SelectFileTypeHdl, weld::ComboBox&, void); - DECL_LINK(DClickFoundHdl, weld::TreeView&, void); + DECL_LINK(DClickFoundHdl, weld::TreeView&, bool); DECL_LINK(PreviewTimerHdl, Timer*, void); DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 06ea7809cb8b..e1bc2f6b1a28 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -42,7 +42,7 @@ namespace svx DECL_LINK( NewHdl, weld::Button&, void ); DECL_LINK( EditHdl, weld::Button&, void ); DECL_LINK( DeleteHdl, weld::Button&, void ); - DECL_LINK( PathBoxDoubleClickHdl, weld::TreeView&, void); + DECL_LINK( PathBoxDoubleClickHdl, weld::TreeView&, bool); DECL_LINK( PathSelect_Impl, weld::TreeView&, void); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index aa03d4da4ddf..9dd566a74a6c 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -53,7 +53,7 @@ protected: int FillTree( const css::uno::Reference< css::container::XNameAccess >& xLinks, const weld::TreeIter* pParentEntry =nullptr ); DECL_LINK( ClickApplyHdl_Impl, weld::Button&, void ); - DECL_LINK( DoubleClickApplyHdl_Impl, weld::TreeView&, void ); + DECL_LINK( DoubleClickApplyHdl_Impl, weld::TreeView&, bool ); DECL_LINK( ClickCloseHdl_Impl, weld::Button&, void ); public: diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 50f14987b492..7c17022edcde 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -63,7 +63,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl std::unique_ptr m_xCbFilelink; std::unique_ptr m_xCbAsIcon; - DECL_LINK(DoubleClickHdl, weld::TreeView&, void); + DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); DECL_LINK(BrowseHdl, weld::Button&, void); DECL_LINK(RadioHdl, weld::Button&, void); bool IsCreateNew() const override { return m_xRbNewObject->get_active(); } diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 5ef41e9b05e1..90d51aba828e 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -58,7 +58,7 @@ class SvBaseLinksDlg : public weld::GenericDialogController ScopedVclPtr m_xVirDev; DECL_LINK( LinksSelectHdl, weld::TreeView&, void ); - DECL_LINK( LinksDoubleClickHdl, weld::TreeView&, void ); + DECL_LINK( LinksDoubleClickHdl, weld::TreeView&, bool ); DECL_LINK( AutomaticClickHdl, weld::Button&, void ); DECL_LINK( ManualClickHdl, weld::Button&, void ); DECL_LINK( UpdateNowClickHdl, weld::Button&, void); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 2069cc4c2ea7..d4403686c237 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -38,7 +38,7 @@ class SfxMacroTabPage final : public SfxTabPage DECL_LINK(SelectGroup_Impl, weld::TreeView&, void); DECL_LINK(SelectMacro_Impl, weld::TreeView&, void); - DECL_LINK(AssignDeleteHdl_Impl, weld::TreeView&, void); + DECL_LINK(AssignDeleteHdl_Impl, weld::TreeView&, bool); DECL_LINK(AssignDeleteClickHdl_Impl, weld::Button&, void); void AssignDeleteHdl(const weld::Widget*); DECL_LINK( TimeOut_Impl, Timer*, void ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index c761e19423b7..3ffb8afa49a9 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -56,7 +56,7 @@ class SvxMacroTabPage_ : public SfxTabPage { DECL_LINK( SelectEvent_Impl, weld::TreeView&, void ); DECL_LINK( AssignDeleteHdl_Impl, weld::Button&, void ); - DECL_LINK( DoubleClickHdl_Impl, weld::TreeView&, void ); + DECL_LINK( DoubleClickHdl_Impl, weld::TreeView&, bool ); static void GenericHandler_Impl( SvxMacroTabPage_* pThis, const weld::Button* pBtn ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 5d68d4082ae9..9a493371731e 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -132,7 +132,7 @@ private: bool Click_Impl(weld::Button& rIB); // Handler DECL_LINK(LostFocusHdl_Impl, weld::Widget&, void); - DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, void); + DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(SelFormatListBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::TreeView&, void); DECL_LINK(SelFormatClickHdl_Impl, weld::Button&, void); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 37b3f0900f2e..1571ae8a243d 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -123,7 +123,7 @@ private: DECL_LINK( SelectHdl_Impl, weld::TreeView&, void ); DECL_LINK( ClickHdl_Impl, weld::Button&, void ); - DECL_LINK( BoxDoubleClickHdl_Impl, weld::TreeView&, void ); + DECL_LINK( BoxDoubleClickHdl_Impl, weld::TreeView&, bool ); typedef std::pair row_col; DECL_LINK( ModulesBoxCheckButtonHdl_Impl, const row_col&, void ); DECL_LINK( DicsBoxCheckButtonHdl_Impl, const row_col&, void ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 5dea8c1f201a..cc3d67b42a05 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -45,7 +45,7 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); DECL_LINK(PathHdl_Impl, weld::Button&, void); - DECL_LINK(DoubleClickPathHdl_Impl, weld::TreeView&, void); + DECL_LINK(DoubleClickPathHdl_Impl, weld::TreeView&, bool); DECL_LINK(StandardHdl_Impl, weld::Button&, void); DECL_LINK(PathSelect_Impl, weld::TreeView&, void); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index ff66beca7c5a..565101d7fe19 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -43,7 +43,7 @@ class SvPasteObjectDialog : public weld::GenericDialogController void SelectObject(); DECL_LINK(SelectHdl, weld::TreeView&, void); - DECL_LINK(DoubleClickHdl, weld::TreeView&, void); + DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); public: SvPasteObjectDialog(weld::Window* pParent); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index a49d0e99095a..6c9e63b109b8 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -133,7 +133,7 @@ private: DECL_LINK(FillTypeCheckHdl_Impl, weld::ToggleButton&, void); DECL_LINK(TabTypeCheckHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::TreeView&, bool); DECL_LINK(ModifyHdl_Impl, weld::ComboBox&, void); DECL_LINK(ReformatHdl_Impl, weld::Widget&, void); DECL_LINK(GetFillCharHdl_Impl, weld::Widget&, void); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 46af0be49cfd..65c4050cc4d3 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -54,7 +54,7 @@ public: DECL_LINK( LanguageHdl_Impl, weld::ComboBox&, void ); DECL_LINK( WordSelectHdl_Impl, weld::ComboBox&, void ); DECL_LINK( AlternativesSelectHdl_Impl, weld::TreeView&, void ); - DECL_LINK( AlternativesDoubleClickHdl_Impl, weld::TreeView&, void ); + DECL_LINK( AlternativesDoubleClickHdl_Impl, weld::TreeView&, bool ); DECL_LINK( SelectFirstHdl_Impl, void*, void ); DECL_LINK( ReplaceEditHdl_Impl, weld::Entry&, void ); DECL_LINK( ModifyTimer_Hdl, Timer *, void ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 1042b68877e3..aa6f7f5b0a02 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -159,7 +159,6 @@ private: void ApplyOptions( bool deactivate ); - DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandCollapseHdl_Impl, weld::TreeView&, void); DECL_LINK(ShowPageHdl_Impl, weld::TreeView&, void); DECL_LINK(BackHdl_Impl, weld::Button&, void); DECL_LINK(ApplyHdl_Impl, weld::Button&, void); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 30a8b444ffd3..0cf15071adf8 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -204,9 +204,10 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, weld::Button&, void) openLinkDialog(OUString(),OUString()); } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, weld::TreeView&, bool) { EditHdl(*m_xEdit); + return true; } IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl, weld::Button&, void) diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 89f3cd3816e2..2b7a91360d09 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -557,9 +557,10 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl, weld::Button&, void ) Reset(); } -IMPL_LINK_NOARG(CuiAboutConfigTabPage, DoubleClickHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(CuiAboutConfigTabPage, DoubleClickHdl_Impl, weld::TreeView&, bool) { StandardHdl_Impl(*m_xEditBtn); + return true; } IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, weld::Button&, void ) diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 008d8009f7dd..b7781859eb4b 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -57,7 +57,7 @@ private: void InsertEntry(const prefBoxEntry& rEntry); DECL_LINK(StandardHdl_Impl, weld::Button&, void); - DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, void); + DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(ResetBtnHdl_Impl, weld::Button&, void); DECL_LINK(SearchHdl_Impl, weld::Button&, void); DECL_LINK(ExpandingHdl_Impl, const weld::TreeIter&, bool); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8fc6da8dd1db..bd88d04f7ce5 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -659,9 +659,10 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, weld::TreeView&, void) EnableRemoveButton(); } -IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, weld::TreeView&, bool) { EditParameter(); + return true; } IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, weld::Button&, void) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 2000145d0b4e..e5537f1e1ff7 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -130,7 +130,7 @@ private: DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); DECL_LINK(AssignHdl_Impl, weld::Button&, void); DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); - DECL_LINK(DblClickHdl_Impl, weld::TreeView&, void); + DECL_LINK(DblClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(RemoveHdl_Impl, weld::Button&, void); DECL_LINK(EditHdl_Impl, weld::Button&, void); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index bdc8579cc37c..c8ee82ad43dd 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1270,7 +1270,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) m_xLinguOptionsCLB->get_height_rows(5)); } -IMPL_LINK(SvxLinguTabPage, BoxDoubleClickHdl_Impl, weld::TreeView&, rBox, void) +IMPL_LINK(SvxLinguTabPage, BoxDoubleClickHdl_Impl, weld::TreeView&, rBox, bool) { if (&rBox == m_xLinguModulesCLB.get()) { @@ -1284,6 +1284,7 @@ IMPL_LINK(SvxLinguTabPage, BoxDoubleClickHdl_Impl, weld::TreeView&, rBox, void) { ClickHdl_Impl(*m_xLinguOptionsEditPB); } + return true; } IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 3760e16c83fe..73110b9e193f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -457,9 +457,10 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } } -IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, weld::TreeView&, bool) { PathHdl_Impl(*m_xPathBtn); + return true; } IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index ab802ecaa63b..845e7651ad68 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -608,14 +608,6 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName, return nRet - 1; } -IMPL_STATIC_LINK(OfaTreeOptionsDialog, ExpandCollapseHdl_Impl, weld::TreeView&, xTreeView, void) -{ - std::unique_ptr xEntry(xTreeView.make_iterator()); - xTreeView.get_selected(xEntry.get()); - if (xTreeView.iter_has_child(*xEntry)) - xTreeView.get_row_expanded(*xEntry) ? xTreeView.collapse_row(*xEntry) : xTreeView.expand_row(*xEntry); -} - IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl, weld::TreeView&, void) { SelectHdl_Impl(); @@ -749,7 +741,6 @@ void OfaTreeOptionsDialog::ApplyItemSets() void OfaTreeOptionsDialog::InitTreeAndHandler() { xTreeLB->set_help_id(HID_OFADLG_TREELISTBOX); - xTreeLB->connect_row_activated( LINK( this, OfaTreeOptionsDialog, ExpandCollapseHdl_Impl ) ); xTreeLB->connect_changed( LINK( this, OfaTreeOptionsDialog, ShowPageHdl_Impl ) ); xBackPB->connect_clicked( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) ); xApplyPB->connect_clicked( LINK( this, OfaTreeOptionsDialog, ApplyHdl_Impl ) ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index d95471f14b0f..1f5f78dfdce2 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -611,9 +611,10 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, weld::TreeView&, rBox, void) m_xEditPB->set_sensitive(rBox.get_selected_id().toInt64() != 0); } -IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, weld::TreeView&, bool) { EditHdl(*m_xEditPB); + return true; } IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 0a62c5aadeb5..df3e47bf489b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -259,9 +259,10 @@ IMPL_LINK(SfxMacroTabPage, AssignDeleteClickHdl_Impl, weld::Button&, rBtn, void) AssignDeleteHdl(&rBtn); } -IMPL_LINK(SfxMacroTabPage, AssignDeleteHdl_Impl, weld::TreeView&, rBtn, void) +IMPL_LINK(SfxMacroTabPage, AssignDeleteHdl_Impl, weld::TreeView&, rBtn, bool) { AssignDeleteHdl(&rBtn); + return true; } void SfxMacroTabPage::AssignDeleteHdl(const weld::Widget* pBtn) @@ -316,7 +317,7 @@ IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Timer*,, void ) void SfxMacroTabPage::InitAndSetHandler() { weld::TreeView& rListBox = mpImpl->m_xEventLB->GetListBox(); - Link aLnk(LINK(this, SfxMacroTabPage, AssignDeleteHdl_Impl)); + Link aLnk(LINK(this, SfxMacroTabPage, AssignDeleteHdl_Impl)); mpImpl->m_xMacroLB->connect_row_activated( aLnk); mpImpl->m_xDeletePB->connect_clicked(LINK(this, SfxMacroTabPage, AssignDeleteClickHdl_Impl)); mpImpl->m_xAssignPB->connect_clicked(LINK(this, SfxMacroTabPage, AssignDeleteClickHdl_Impl)); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 18517527dca6..3a7dc1b053d4 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1118,8 +1118,7 @@ void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox() #* Output: --- #* #************************************************************************/ - -IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, void) +IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, bool) { SelFormatHdl_Impl(&rLb); @@ -1127,8 +1126,9 @@ IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, voi assert(pController); weld::Button& rOkButton = pController->GetOKButton(); rOkButton.clicked(); -} + return true; +} /************************************************************************* #* Method: SelFormatHdl_Impl diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 5c347ffd5612..f9b7205247cb 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, GetDezCharHdl_Impl, weld::Widget&, void) } } -IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, weld::TreeView&, bool) { const int nPos = FindCurrentTab(); if (nPos != -1) @@ -624,6 +624,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, weld::TreeView&, void) m_xNewBtn->set_sensitive(false); SetFillAndTabType_Impl(); } + return true; } OUString SvxTabulatorTabPage::FormatTab() -- cgit