sw/source/uibase/inc/conttree.hxx | 4 ++-- sw/source/uibase/utlui/content.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 180606c1debaec3d36426c1c7f37e69637142048 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Mar 5 12:42:44 2021 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Mar 5 21:24:34 2021 +0100 rename SwContentTree FocusHdl to match SwGlobalTree equivalent Change-Id: I5f06d857c04f5378df45e149d779466584fc0ce3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112016 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 478d9da699e9..24488a8c713b 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -173,7 +173,7 @@ class SwContentTree final : public SfxListener DECL_LINK(CollapseHdl, const weld::TreeIter&, bool); DECL_LINK(ContentDoubleClickHdl, weld::TreeView&, bool); DECL_LINK(SelectHdl, weld::TreeView&, void); - DECL_LINK(FocusHdl, weld::Widget&, void); + DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(CommandHdl, const CommandEvent&, bool); DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString); @@ -252,7 +252,7 @@ public: void grab_focus() { m_xTreeView->grab_focus(); - FocusHdl(*m_xTreeView); + FocusInHdl(*m_xTreeView); } OUString get_selected_text() const diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 885d63da164e..605831d3b360 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -930,7 +930,7 @@ SwContentTree::SwContentTree(std::unique_ptr<weld::TreeView> xTreeView, SwNaviga m_xTreeView->connect_collapsing(LINK(this, SwContentTree, CollapseHdl)); m_xTreeView->connect_row_activated(LINK(this, SwContentTree, ContentDoubleClickHdl)); m_xTreeView->connect_changed(LINK(this, SwContentTree, SelectHdl)); - m_xTreeView->connect_focus_in(LINK(this, SwContentTree, FocusHdl)); + m_xTreeView->connect_focus_in(LINK(this, SwContentTree, FocusInHdl)); m_xTreeView->connect_key_press(LINK(this, SwContentTree, KeyInputHdl)); m_xTreeView->connect_popup_menu(LINK(this, SwContentTree, CommandHdl)); m_xTreeView->connect_query_tooltip(LINK(this, SwContentTree, QueryTooltipHdl)); @@ -3496,7 +3496,7 @@ void SwContentTree::MoveOutline(SwOutlineNodes::size_type nTargetPos) } // Update immediately -IMPL_LINK_NOARG(SwContentTree, FocusHdl, weld::Widget&, void) +IMPL_LINK_NOARG(SwContentTree, FocusInHdl, weld::Widget&, void) { SwView* pActView = GetParentWindow()->GetCreateView(); if(pActView) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits