weld: Pass activated row in TreeView::signal_row_activated

This is basically the weld::TreeView version of earlier commit Change-Id: I8ca62ac32108f01e2055d5ef9301de22eb5b1931 Author: Michael Weghorn <m.weghorn@posteo.de> Date: Wed Apr 8 12:35:25 2026 +0200 weld: Pass activated item in IconView::signal_item_activated applying an equivalent change for weld::IconView instead of weld::TreeView. See that commit for more details/background. For weld::TreeView, the weld::TreeIter refers to a full row (and columns are handled separately by a column index in the weld::TreeView API). As for the above commit: Initially, leave the logic of the existing signal handlers/callbackes (in dialog implementations) unchanged. At least some of them will be simplified in upcoming commits to use the newly passed weld::TreeIter param directly instead of determining the current/activated row a different way. Change-Id: Ie6a962702d4f7f069b2f7b77a22a78722b2a6408 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203331 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2026-04-09 10:21:45 +02:00
parent 1af30d1ad3
commit 11789e47ac
193 changed files with 262 additions and 244 deletions
@@ -499,7 +499,7 @@ private:
    void SetMatchingEntries(); // sets the visible entries based on aFuncBuffer variable
    TextView* GetParentEditView();

-    DECL_LINK(ImplDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(ImplDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(ImplSelectHdl, weld::TreeView&, void);
    DECL_LINK(KeyInputHdl, const KeyEvent&, bool);

@@ -2665,7 +2665,7 @@ void WatchWindow::UpdateWatches(bool bBasicStopped)
    setBasicWatchMode( false );
 }

-IMPL_LINK_NOARG(CodeCompleteWindow, ImplDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(CodeCompleteWindow, ImplDoubleClickHdl, const weld::TreeIter&, bool)
 {
    InsertSelectedEntry();
    return true;
@@ -886,7 +886,7 @@ void SbTreeListBox::SetCurrentEntry (EntryDescriptor const & rDesc)
    m_xControl->set_cursor(*xCurIter);
 }

-IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, const weld::TreeIter&, bool)
 {
    std::unique_ptr<weld::TreeIter> pCursor = m_xControl->get_cursor();
    if (!pCursor)
@@ -161,7 +161,7 @@ IMPL_LINK(BreakPointDialog, FieldModifyHdl, weld::SpinButton&, rEdit, void)
        pBrk->nStopAfter = rEdit.get_value();
 }

-IMPL_LINK_NOARG(BreakPointDialog, TreeModifyHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(BreakPointDialog, TreeModifyHdl, const weld::TreeIter&, bool)
 {
    if (m_xDelButton->get_sensitive())
        ButtonHdl(*m_xDelButton);
@@ -45,7 +45,7 @@ class BreakPointDialog final : public weld::GenericDialogController
    DECL_LINK(EditModifyHdl, weld::ComboBox&, void);
    DECL_LINK(FieldModifyHdl, weld::SpinButton&, void);
    DECL_LINK(ButtonHdl, weld::Button&, void);
-    DECL_LINK(TreeModifyHdl, weld::TreeView&, bool);
+    DECL_LINK(TreeModifyHdl, const weld::TreeIter&, bool);
    void UpdateFields(BreakPoint const& rBrk);
    BreakPoint* GetSelectedBreakPoint();

@@ -456,7 +456,7 @@ void MacroChooser::CheckButtons()
    }
 }

-IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, const weld::TreeIter&, bool)
 {
    SbMethod* pMethod = GetMacro();
    SbModule* pModule = pMethod ? pMethod->GetModule() : nullptr;
@@ -57,7 +57,7 @@ private:
    Mode                    nMode;

    DECL_LINK(MacroSelectHdl, weld::TreeView&, void);
-    DECL_LINK(MacroDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(MacroDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(BasicSelectHdl, weld::TreeView&, void);
    DECL_LINK(EditModifyHdl, weld::Entry&, void);
    DECL_LINK(ContextMenuHdl, const CommandEvent&, bool);
@@ -1243,7 +1243,7 @@ IMPL_LINK(ObjectBrowser, OnRightNodeExpand, const weld::TreeIter&, rParentIter,
    return true;
 }

-IMPL_LINK_NOARG(ObjectBrowser, OnRightTreeDoubleClick, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ObjectBrowser, OnRightTreeDoubleClick, const weld::TreeIter&, bool)
 {
    SAL_INFO("basctl", "OnRightTreeDoubleClick: Handler entered.");

@@ -185,7 +185,7 @@ private:

 protected:
    DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool);
-    DECL_LINK(OpenCurrentHdl, weld::TreeView&, bool);
+    DECL_LINK(OpenCurrentHdl, const weld::TreeIter&, bool);
    // Creates popup menu to select between alphabetic or unsorted view in Macro List Tree
    DECL_LINK(ContextMenuHdl, const CommandEvent&, bool);
    void                    ImpCreateLibEntries(const weld::TreeIter& rShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation);
@@ -132,7 +132,7 @@ private:
    DECL_LINK(OnLeftTreeSelect, weld::TreeView&, void);
    DECL_LINK(OnRightTreeSelect, weld::TreeView&, void);
    DECL_LINK(OnRightNodeExpand, const weld::TreeIter&, bool);
-    DECL_LINK(OnRightTreeDoubleClick, weld::TreeView&, bool);
+    DECL_LINK(OnRightTreeDoubleClick, const weld::TreeIter&, bool);
    DECL_LINK(OnNodeExpand, const weld::TreeIter&, bool);
    DECL_LINK(OnScopeChanged, weld::ComboBox&, void);
 };
@@ -1644,7 +1644,7 @@ IMPL_LINK(SvxConfigPage, MoveHdl, weld::Button&, rButton, void)
    MoveEntry(&rButton == m_xMoveUpButton.get());
 }

-IMPL_LINK_NOARG(SvxConfigPage, FunctionDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxConfigPage, FunctionDoubleClickHdl, const weld::TreeIter&, bool)
 {
    if (m_xAddCommandButton->get_sensitive())
        m_xAddCommandButton->clicked();
@@ -1217,7 +1217,7 @@ IMPL_LINK(SvxScriptSelectorDialog, SelectHdl, weld::TreeView&, rCtrl, void)
    UpdateUI();
 }

-IMPL_LINK_NOARG(SvxScriptSelectorDialog, FunctionDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxScriptSelectorDialog, FunctionDoubleClickHdl, const weld::TreeIter&, bool)
 {
    if (m_xOKButton->get_sensitive())
        ClickHdl(*m_xOKButton);
@@ -392,7 +392,7 @@ IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, weld::Button&, rBtn, void )
    GenericHandler_Impl(&rBtn);
 }

-IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxMacroTabPage_, DoubleClickHdl_Impl, const weld::TreeIter&, bool)
 {
    GenericHandler_Impl(nullptr);
    return true;
@@ -858,7 +858,7 @@ IMPL_LINK(MacroManagerDialog, SelectHdl, weld::TreeView&, rTreeView, void)

 // IMPL_LINK_NOARG(SvxScriptSelectorDialog, FunctionDoubleClickHdl, weld::TreeView&, bool)
 // cui/source/customize/cfgutil.cxx
-IMPL_LINK_NOARG(MacroManagerDialog, FunctionDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(MacroManagerDialog, FunctionDoubleClickHdl, const weld::TreeIter&, bool)
 {
    if (m_xRunButton->get_sensitive())
        ClickHdl(*m_xRunButton);
@@ -561,7 +561,7 @@ void SpellDialog::processDictionaryEvent(const DictionaryEvent& rDicEvt)
    }
 }

-IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, const weld::TreeIter&, bool)
 {
    ChangeHdl(*m_xChangePB);
    return true;
@@ -964,7 +964,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, weld::TreeView&, void)
        aPreviewTimer.Start();
 }

-IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, const weld::TreeIter&, bool)
 {
    if( bInputAllowed )
    {
@@ -470,7 +470,7 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(std::u16string_view aStrMark)
 }

 // Click on Apply-Button / Double-click on item in tree
-IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, const weld::TreeIter&, bool)
 {
    ClickApplyHdl_Impl(*mxBtApply);
    return true;
@@ -85,7 +85,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(weld::Window* pParent,
 {
 }

-IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -223,7 +223,7 @@ void SvBaseLinksDlg::LinksSelectHdl(weld::TreeView* pSvTabListBox)
    }
 }

-IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, weld::TreeView&, bool )
+IMPL_LINK_NOARG(SvBaseLinksDlg, LinksDoubleClickHdl, const weld::TreeIter&, bool)
 {
    ChangeSourceClickHdl(*m_xPbChangeSource);
    return true;
@@ -61,7 +61,7 @@ IMPL_LINK_NOARG(SvPasteObjectDialog, SelectHdl, weld::TreeView&, void)
        m_xOKButton->set_sensitive(true);
 }

-IMPL_LINK_NOARG(SvPasteObjectDialog, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvPasteObjectDialog, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -197,7 +197,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, weld::TreeView&, rBox
    }
 }

-IMPL_LINK_NOARG(SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, const weld::TreeIter&, bool)
 {
    int nEntry = m_xAlternativesCT->get_selected_index();
    if (nEntry != -1)
@@ -80,7 +80,7 @@ public:
    {
        m_xTreeView->connect_command(rLink);
    }
-    void connect_row_activated(const Link<weld::TreeView&, bool>& rLink)
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& rLink)
    {
        m_xTreeView->connect_row_activated(rLink);
    }
@@ -202,7 +202,7 @@ class MacroManagerDialog : public weld::GenericDialogController, public SfxListe

    DECL_LINK(ClickHdl, weld::Button&, void);
    DECL_LINK(SelectHdl, weld::TreeView&, void);
-    DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(ContextMenuHdl, const CommandEvent&, bool);
    DECL_LINK(CheckPasswordHdl, SvxPasswordDialog*, bool);

@@ -192,7 +192,7 @@ private:
    std::shared_ptr<SfxSingleTabDialogController> m_xOptionsDlg;

    DECL_LINK(ChangeHdl, weld::Button&, void);
-    DECL_LINK(DoubleClickChangeHdl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickChangeHdl, const weld::TreeIter&, bool);
    DECL_LINK(ChangeAllHdl, weld::Button&, void);
    DECL_LINK(IgnoreAllHdl, weld::Button&, void);
    DECL_LINK(IgnoreHdl, weld::Button&, void);
@@ -23,6 +23,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/SpinButton.hxx>
+#include <vcl/weld/TreeIter.hxx>

 #include <map>
 #include <set>
@@ -119,7 +120,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage

    DECL_LINK(SelectHdl, weld::TreeView&, void);
    DECL_LINK(EditHdl, weld::Button&, void);
-    DECL_LINK(DoubleClickEditHdl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickEditHdl, const weld::TreeIter&, bool);

    void CreateEntry(const OUString& rTxt, sal_uInt16 nCol);

@@ -441,7 +441,7 @@ protected:

    DECL_LINK(MoveHdl, weld::Button&, void);
    DECL_LINK(SelectFunctionHdl, weld::TreeView&, void);
-    DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(SelectSaveInLocation, weld::ComboBox&, void);
    DECL_LINK(SelectElementHdl, weld::ComboBox&, void);
    DECL_LINK(ImplUpdateDataHdl, Timer*, void);
@@ -122,7 +122,10 @@ public:
        m_xTreeView->connect_selection_changed(rLink);
    }
    void connect_command(const Link<const CommandEvent&, bool>& rLink) { m_xTreeView->connect_command(rLink); }
-    void connect_row_activated(const Link<weld::TreeView&, bool>& rLink) { m_xTreeView->connect_row_activated(rLink); }
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& 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)
@@ -258,7 +261,7 @@ class SvxScriptSelectorDialog : public weld::GenericDialogController

    DECL_LINK(ClickHdl, weld::Button&, void);
    DECL_LINK(SelectHdl, weld::TreeView&, void);
-    DECL_LINK(FunctionDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(ContextMenuHdl, const CommandEvent&, bool);

    void                            UpdateUI();
@@ -255,7 +255,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&, bool);
+    DECL_LINK(DClickFoundHdl, const weld::TreeIter&, bool);
    DECL_LINK(PreviewTimerHdl, Timer*, void);
    DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void);

@@ -41,7 +41,7 @@ private:
    DECL_LINK(NewHdl, weld::Button&, void);
    DECL_LINK(EditHdl, weld::Button&, void);
    DECL_LINK(DeleteHdl, weld::Button&, void);
-    DECL_LINK(PathBoxDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(PathBoxDoubleClickHdl, const weld::TreeIter&, bool);

    DECL_LINK(PathSelect_Impl, weld::TreeView&, void);

@@ -52,7 +52,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&, bool );
+    DECL_LINK(DoubleClickApplyHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK( ClickCloseHdl_Impl, weld::Button&, void );

 public:
@@ -65,7 +65,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
    std::unique_ptr<weld::CheckButton> m_xCbFilelink;
    std::unique_ptr<weld::CheckButton> m_xCbAsIcon;

-    DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(BrowseHdl, weld::Button&, void);
    DECL_LINK(RadioHdl, weld::Toggleable&, void);
    bool IsCreateNew() const override { return m_xRbNewObject->get_active(); }
@@ -59,7 +59,7 @@ class SvBaseLinksDlg : public weld::GenericDialogController
    ScopedVclPtr<VirtualDevice> m_xVirDev;

    DECL_LINK(LinksSelectHdl, weld::TreeView&, void);
-    DECL_LINK(LinksDoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(LinksDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
    DECL_LINK(UpdateNowClickHdl, weld::Button&, void);
    DECL_LINK(ChangeSourceClickHdl, weld::Button&, void);
@@ -54,8 +54,8 @@ class SfxMacroTabPage final : public SfxTabPage
    DECL_LINK(SelectGroup_Impl, weld::TreeView&, void);
    DECL_LINK(SelectMacro_Impl, weld::TreeView&, void);

-    DECL_LINK(MacroTreeViewActivatedHdl, weld::TreeView&, bool);
-    DECL_LINK(AssignmentsTreeViewActivatedHdl, weld::TreeView&, bool);
+    DECL_LINK(MacroTreeViewActivatedHdl, const weld::TreeIter&, bool);
+    DECL_LINK(AssignmentsTreeViewActivatedHdl, const weld::TreeIter&, bool);
    DECL_LINK(AssignDeleteClickHdl_Impl, weld::Button&, void);
    void AssignDeleteHdl(const weld::Widget*);
    DECL_LINK( TimeOut_Impl, Timer*, void );
@@ -39,7 +39,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&, bool );
+    DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK( DeleteAllHdl_Impl, weld::Button&, void );

    void GenericHandler_Impl(const weld::Button* pBtn);
@@ -136,7 +136,7 @@ private:
    bool    Click_Impl(const weld::Button& rIB);
    // Handler
    DECL_LINK(LostFocusHdl_Impl, weld::Widget&, void);
-    DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(SelFormatListBoxHdl_Impl, weld::ComboBox&, void);
    DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::TreeView&, void);
    DECL_LINK(SelFormatClickHdl_Impl, weld::Toggleable&, void);
@@ -124,7 +124,7 @@ private:

    DECL_LINK( SelectHdl_Impl, weld::TreeView&, void );
    DECL_LINK( ClickHdl_Impl, weld::Button&, void );
-    DECL_LINK( BoxDoubleClickHdl_Impl, weld::TreeView&, bool );
+    DECL_LINK(BoxDoubleClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK( ModulesBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
    DECL_LINK( DicsBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
    DECL_LINK( PostDblClickHdl_Impl, void *, void);
@@ -45,7 +45,7 @@ private:
    void        ChangeCurrentEntry( const OUString& _rFolder );

    DECL_LINK(PathHdl_Impl, weld::Button&, void);
-    DECL_LINK(DoubleClickPathHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickPathHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(StandardHdl_Impl, weld::Button&, void);

    DECL_LINK(PathSelect_Impl, weld::TreeView&, void);
@@ -45,7 +45,7 @@ class SvPasteObjectDialog : public weld::GenericDialogController

    void            SelectObject();
    DECL_LINK(SelectHdl, weld::TreeView&, void);
-    DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool);

 public:
    SvPasteObjectDialog(weld::Window* pParent);
@@ -134,7 +134,7 @@ private:
    DECL_LINK(FillTypeCheckHdl_Impl, weld::Toggleable&, void);
    DECL_LINK(TabTypeCheckHdl_Impl, weld::Toggleable&, void);

-    DECL_LINK(SelectHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(SelectHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(ModifyHdl_Impl, weld::ComboBox&, void);
    DECL_LINK(ReformatHdl_Impl, weld::Widget&, void);
    DECL_LINK(GetFillCharHdl_Impl, weld::Widget&, void);
@@ -60,7 +60,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&, bool );
+    DECL_LINK(AlternativesDoubleClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK( SelectFirstHdl_Impl, void*, void );
    DECL_LINK( ReplaceEditHdl_Impl, weld::Entry&, void );
    DECL_LINK( ModifyTimer_Hdl, Timer *, void );
@@ -228,7 +228,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, weld::Button&, void)
    openLinkDialog(OUString(),OUString());
 }

-IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, const weld::TreeIter&, bool)
 {
    EditHdl(*m_xEdit);
    return true;
@@ -768,7 +768,7 @@ CuiAboutConfigTabPage::commaStringToSequence(std::u16string_view rCommaSepString

 IMPL_LINK_NOARG(CuiAboutConfigTabPage, ResetBtnHdl_Impl, weld::Button&, void) { Reset(); }

-IMPL_LINK_NOARG(CuiAboutConfigTabPage, DoubleClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(CuiAboutConfigTabPage, DoubleClickHdl_Impl, const weld::TreeIter&, bool)
 {
    StandardHdl_Impl(*m_xEditBtn);
    return true;
@@ -60,7 +60,7 @@ private:

    DECL_LINK(QueryTooltip, const weld::TreeIter& rIter, OUString);
    DECL_LINK(StandardHdl_Impl, weld::Button&, void);
-    DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(ResetBtnHdl_Impl, weld::Button&, void);
    DECL_LINK(SearchHdl_Impl, weld::Button&, void);
    DECL_LINK(ModifiedHdl_Impl, weld::Toggleable&, void);
@@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, weld::TreeView&, void)
    EnableRemoveButton();
 }

-IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, const weld::TreeIter&, bool)
 {
    EditParameter();
    return true;
@@ -131,7 +131,7 @@ private:
    DECL_LINK(ActivateHdl_Impl, weld::Entry&, bool);
    DECL_LINK(AssignHdl_Impl, weld::Button&, void);
    DECL_LINK(SelectHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(DblClickHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DblClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(RemoveHdl_Impl, weld::Button&, void);
    DECL_LINK(EditHdl_Impl, weld::Button&, void);

@@ -1295,16 +1295,16 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
    }
 }

-IMPL_LINK(SvxLinguTabPage, BoxDoubleClickHdl_Impl, weld::TreeView&, rBox, bool)
+IMPL_LINK(SvxLinguTabPage, BoxDoubleClickHdl_Impl, const weld::TreeIter&, rIter, bool)
 {
-    if (&rBox == m_xLinguModulesCLB.get() && !m_nDlbClickEventId)
+    if (&rIter.getItemView() == m_xLinguModulesCLB.get() && !m_nDlbClickEventId)
    {
        //! in order to avoid a bug causing a GPF when double clicking
        //! on a module entry and exiting the "Edit Modules" dialog
        //! after that.
        m_nDlbClickEventId = Application::PostUserEvent(LINK(this, SvxLinguTabPage, PostDblClickHdl_Impl));
    }
-    else if (&rBox == m_xLinguOptionsCLB.get())
+    else if (&rIter.getItemView() == m_xLinguOptionsCLB.get())
    {
        ClickHdl_Impl(*m_xLinguOptionsEditPB);
    }
@@ -468,7 +468,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
    }
 }

-IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, const weld::TreeIter&, bool)
 {
    PathHdl_Impl(*m_xPathBtn);
    return true;
@@ -668,7 +668,7 @@ 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&, bool)
+IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, const weld::TreeIter&, bool)
 {
    EditHdl(*m_xEditPB);
    return true;
@@ -258,13 +258,13 @@ IMPL_LINK(SfxMacroTabPage, AssignDeleteClickHdl_Impl, weld::Button&, rBtn, void)
    AssignDeleteHdl(&rBtn);
 }

-IMPL_LINK_NOARG(SfxMacroTabPage, MacroTreeViewActivatedHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SfxMacroTabPage, MacroTreeViewActivatedHdl, const weld::TreeIter&, bool)
 {
    AssignDeleteHdl(&m_xMacroLB->get_widget());
    return true;
 }

-IMPL_LINK_NOARG(SfxMacroTabPage, AssignmentsTreeViewActivatedHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SfxMacroTabPage, AssignmentsTreeViewActivatedHdl, const weld::TreeIter&, bool)
 {
    AssignDeleteHdl(&m_xEventLB->GetListBox());
    return true;
@@ -1086,7 +1086,7 @@ void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox()
 #*  Output:     ---
 #*
 #************************************************************************/
-IMPL_LINK_NOARG(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxNumberFormatTabPage, DoubleClickHdl_Impl, const weld::TreeIter&, bool)
 {
    SelFormatHdl_Impl(m_xLbFormat.get());

@@ -618,7 +618,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, GetDezCharHdl_Impl, weld::Widget&, void)
    }
 }

-IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, const weld::TreeIter&, bool)
 {
    const int nPos = FindCurrentTab();
    if (nPos != -1)
@@ -838,9 +838,10 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r
        showPreview(nullptr);
 }

-IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, weld::TreeView&, rTreeView, bool)
+IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, const weld::TreeIter&, rIter, bool)
 {
-    return getBorderWin().getView()->getAppController().onEntryDoubleClick(rTreeView);
+    return getBorderWin().getView()->getAppController().onEntryDoubleClick(
+        dynamic_cast<const weld::TreeView&>(rIter.getItemView()));
 }

 IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange, LinkParamNone*, void)
@@ -146,7 +146,7 @@ namespace dbaui
        */
        std::unique_ptr<DBTreeViewBase> createSimpleTree(const OUString& rHelpId, ElementType eType);

-        DECL_LINK( OnEntryDoubleClick,    weld::TreeView&, bool );
+        DECL_LINK(OnEntryDoubleClick, const weld::TreeIter&, bool);
        DECL_LINK( OnEntrySelChange,      LinkParamNone*, void );

        DECL_LINK( OnCopyEntry,           LinkParamNone*, void );
@@ -64,7 +64,7 @@ void OTasksWindow::updateHelpText()
    setHelpText(pHelpTextId);
 }

-IMPL_LINK_NOARG(OTasksWindow, onSelected, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OTasksWindow, onSelected, const weld::TreeIter&, bool)
 {
    m_nCursorIndex = m_xTreeView->get_cursor_index();
    if (m_nCursorIndex != -1)
@@ -70,7 +70,7 @@ namespace dbaui

        int m_nCursorIndex;

-        DECL_LINK(onSelected, weld::TreeView&, bool);
+        DECL_LINK(onSelected, const weld::TreeIter&, bool);
        DECL_LINK(OnEntrySelectHdl, weld::TreeView&, void);
        DECL_LINK(FocusInHdl, weld::Widget&, void);
        DECL_LINK(FocusOutHdl, weld::Widget&, void);
@@ -218,7 +218,7 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click, weld::Button&, void)
    }
 }

-IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, const weld::TreeIter&, bool)
 {
    try
    {
@@ -397,7 +397,7 @@ IMPL_LINK_NOARG( OAddTableDlg, AddClickHdl, weld::Button&, void )
    Add();
 }

-IMPL_LINK_NOARG(OAddTableDlg, TableListDoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OAddTableDlg, TableListDoubleClickHdl, const weld::TreeIter&, bool)
 {
    Add();
    return true;
@@ -44,7 +44,7 @@ ODatasourceSelectDialog::~ODatasourceSelectDialog()
 {
 }

-IMPL_LINK_NOARG(ODatasourceSelectDialog, ListDblClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ODatasourceSelectDialog, ListDblClickHdl, const weld::TreeIter&, bool)
 {
    if (m_xDatasource->n_children())
        m_xDialog->response(RET_OK);
@@ -46,7 +46,7 @@ public:
    virtual short run() override;

 private:
-    DECL_LINK(ListDblClickHdl, weld::TreeView&, bool);
+    DECL_LINK(ListDblClickHdl, const weld::TreeIter&, bool);
 #ifdef HAVE_ODBC_ADMINISTRATION
    DECL_LINK(ManageClickHdl, weld::Button&, void);
    DECL_LINK(ManageProcessFinished, void*, void);
@@ -50,7 +50,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&, bool);
+        DECL_LINK(Dbl_Click_FileView, const weld::TreeIter&, bool);

        /// sets the fixedtext to the right content
        void initCurrentPath();
@@ -53,7 +53,7 @@ namespace dbaui
        std::unique_ptr<weld::TreeView> m_xTreeView;
        std::unique_ptr<TableWindowListBoxHelper> m_xDragDropTargetHelper;

-        DECL_LINK( OnDoubleClick, weld::TreeView&, bool );
+        DECL_LINK(OnDoubleClick, const weld::TreeIter&, bool);
        DECL_LINK(CommandHdl, const CommandEvent&, bool);
        DECL_LINK( DropHdl, void*, void );
        DECL_LINK( LookForUiHdl, void*, void );
@@ -39,7 +39,7 @@ namespace dbaui
        std::unique_ptr<weld::TreeView> m_xNewColumnNames; // right side

        DECL_LINK( ButtonClickHdl, weld::Button&, void );
-        DECL_LINK( ListDoubleClickHdl, weld::TreeView&, bool );
+        DECL_LINK(ListDoubleClickHdl, const weld::TreeIter&, bool);

        static void clearListBox(weld::TreeView& _rListBox);
        static void fillColumns(weld::TreeView const * pRight,
@@ -70,7 +70,7 @@ namespace dbaui

        DECL_LINK( AddClickHdl, weld::Button&, void );
        DECL_LINK( CloseClickHdl, weld::Button&, void);
-        DECL_LINK( TableListDoubleClickHdl, weld::TreeView&, bool );
+        DECL_LINK(TableListDoubleClickHdl, const weld::TreeIter&, bool);
        DECL_LINK( TableListSelectHdl, weld::TreeView&, void );
        DECL_LINK( OnTypeSelected, weld::Toggleable&, void );

@@ -217,10 +217,10 @@ IMPL_LINK(OWizColumnSelect, ButtonClickHdl, weld::Button&, rButton, void)
        m_xOrgColumnNames->select(0);
 }

-IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, weld::TreeView&, rListBox, bool )
+IMPL_LINK(OWizColumnSelect, ListDoubleClickHdl, const weld::TreeIter&, rIter, bool)
 {
    weld::TreeView *pLeft,*pRight;
-    if (&rListBox == m_xOrgColumnNames.get())
+    if (&rIter.getItemView() == m_xOrgColumnNames.get())
    {
        pLeft  = m_xOrgColumnNames.get();
        pRight = m_xNewColumnNames.get();
@@ -260,7 +260,7 @@ void OTableWindowListBox::GetFocus()
    InterimItemWindow::GetFocus();
 }

-IMPL_LINK_NOARG(OTableWindowListBox, OnDoubleClick, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OTableWindowListBox, OnDoubleClick, const weld::TreeIter&, bool)
 {
    // tell my parent
    vcl::Window* pParent = Window::GetParent();
@@ -68,7 +68,7 @@ namespace abp
        m_xTableList->select_text(rSettings.sSelectedTable);
    }

-    IMPL_LINK_NOARG( TableSelectionPage, OnTableDoubleClicked, weld::TreeView&, bool )
+    IMPL_LINK_NOARG(TableSelectionPage, OnTableDoubleClicked, const weld::TreeIter&, bool)
    {
        if (m_xTableList->count_selected_rows() == 1)
            getDialog()->travelNext();
@@ -44,7 +44,7 @@ namespace abp
        virtual bool        canAdvance() const override;

        DECL_LINK(OnTableSelected, weld::TreeView&, void);
-        DECL_LINK(OnTableDoubleClicked, weld::TreeView&, bool);
+        DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool);
    };

 }   // namespace abp
@@ -415,7 +415,7 @@ class DBChangeDialog_Impl : public weld::GenericDialogController

    std::unique_ptr<weld::TreeView> m_xSelectionLB;

-    DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool);
 public:
    DBChangeDialog_Impl(weld::Window* pParent, const BibDataManager* pMan);

@@ -445,7 +445,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, const BibDataMan
    }
 }

-IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -206,7 +206,7 @@ IMPL_LINK_NOARG(OTableSelectionPage, OnSearchClicked, weld::Button&, void)
    }
 }

-IMPL_LINK_NOARG(OTableSelectionPage, OnListboxDoubleClicked, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OTableSelectionPage, OnListboxDoubleClicked, const weld::TreeIter&, bool)
 {
    if (m_xTable->count_selected_rows())
        getDialog()->travelNext();
@@ -49,7 +49,7 @@ private:
    virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;

    DECL_LINK(OnListboxSelection, weld::TreeView&, void);
-    DECL_LINK(OnListboxDoubleClicked, weld::TreeView&, bool);
+    DECL_LINK(OnListboxDoubleClicked, const weld::TreeIter&, bool);
    DECL_LINK(OnSearchClicked, weld::Button&, void);

    void implFillTables(const css::uno::Reference<css::sdbc::XConnection>& _rxConn
@@ -361,9 +361,9 @@ namespace dbp
        getDialog()->enableButtons(WizardButtonFlags::FINISH, 0 != m_xSelFields->n_children());
    }

-    IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, weld::TreeView&, rList, bool)
+    IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, const weld::TreeIter&, rIter, bool)
    {
-        weld::Button* pSimulateButton = m_xExistFields.get() == &rList ? m_xSelectOne.get() : m_xDeselectOne.get();
+        weld::Button* pSimulateButton = m_xExistFields.get() == &rIter.getItemView() ? m_xSelectOne.get() : m_xDeselectOne.get();
        if (pSimulateButton->get_sensitive())
            OnMoveOneEntry(*pSimulateButton);
        return true;
@@ -93,7 +93,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&, bool);
+        DECL_LINK(OnEntryDoubleClicked, const weld::TreeIter&, bool);

        void implCheckButtons();
    };
@@ -297,7 +297,7 @@ IMPL_LINK_NOARG(OContentTableSelection, OnTableSelected, weld::TreeView&, void)
    updateDialogTravelUI();
 }

-IMPL_LINK_NOARG(OContentTableSelection, OnTableDoubleClicked, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OContentTableSelection, OnTableDoubleClicked, const weld::TreeIter&, bool)
 {
    if (m_xSelectTable->count_selected_rows())
        getDialog()->travelNext();
@@ -376,7 +376,7 @@ bool OContentFieldSelection::canAdvance() const
    return 0 != m_xSelectTableField->count_selected_rows();
 }

-IMPL_LINK_NOARG(OContentFieldSelection, OnTableDoubleClicked, weld::TreeView&, bool)
+IMPL_LINK_NOARG(OContentFieldSelection, OnTableDoubleClicked, const weld::TreeIter&, bool)
 {
    if (m_xSelectTableField->count_selected_rows())
        getDialog()->travelNext();
@@ -114,7 +114,7 @@ private:
    virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;
    virtual bool canAdvance() const override;

-    DECL_LINK(OnTableDoubleClicked, weld::TreeView&, bool);
+    DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool);
    DECL_LINK(OnTableSelected, weld::TreeView&, void);
 };

@@ -130,7 +130,7 @@ public:

 private:
    DECL_LINK(OnFieldSelected, weld::TreeView&, void);
-    DECL_LINK(OnTableDoubleClicked, weld::TreeView&, bool);
+    DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool);

    // OWizardPage overridables
    virtual void initializePage() override;
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, weld::TreeVie
    updateStates();
 }

-IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl, const weld::TreeIter&, bool)
 {
    onEdit();
    return true;
@@ -38,7 +38,7 @@ public:

    DECL_LINK(ClickHdl_Impl, weld::Button&, void );
    DECL_LINK(SelectionChangedHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool);

    void    UpdateWindow();

@@ -306,7 +306,7 @@ IMPL_LINK_NOARG(FuncPage, SelTreeViewHdl, weld::TreeView&, void)
    aSelectionLink.Call(*this);
 }

-IMPL_LINK_NOARG(FuncPage, DblClkHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(FuncPage, DblClkHdl, const weld::TreeIter&, bool)
 {
    const OUString aString = m_xLbFunction->get_selected_text();
    if (mCategories.contains(aString))
@@ -70,7 +70,7 @@ private:

    DECL_LINK(SelComboBoxHdl, weld::ComboBox&, void);
    DECL_LINK(SelTreeViewHdl, weld::TreeView&, void);
-    DECL_LINK(DblClkHdl, weld::TreeView&, bool);
+    DECL_LINK(DblClkHdl, const weld::TreeIter&, bool);
    DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
    DECL_LINK(ModifyHdl, weld::Entry&, void);
    DECL_LINK(SelHelpClickHdl, weld::Button&, void);
@@ -112,7 +112,7 @@ IMPL_LINK_NOARG( PlacesListBox, Selection, weld::TreeView&, void )
    updateView();
 }

-IMPL_LINK_NOARG( PlacesListBox, DoubleClick, weld::TreeView&, bool )
+IMPL_LINK_NOARG(PlacesListBox, DoubleClick, const weld::TreeIter&, bool)
 {
    int nSelected = mxImpl->get_cursor_index();
    if (nSelected == -1)
@@ -58,7 +58,7 @@ private:
    static OUString getEntryIcon(const PlacePtr& pPlace);

    DECL_LINK( Selection, weld::TreeView&, void );
-    DECL_LINK( DoubleClick, weld::TreeView&, bool );
+    DECL_LINK(DoubleClick, const weld::TreeIter&, bool);
    DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString);
 };

@@ -177,7 +177,7 @@ public:

    OUString get_id(const weld::TreeIter& rIter) { return mxTreeView->get_id(rIter); }

-    void connect_row_activated(const Link<weld::TreeView&, bool>& rLink) { mxTreeView->connect_row_activated(rLink); }
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& rLink) { mxTreeView->connect_row_activated(rLink); }
    void connect_changed(const Link<weld::TreeView&, void>& rLink)
    {
        mxTreeView->connect_selection_changed(rLink);
@@ -362,7 +362,7 @@ public:
 protected:
    DECL_LINK(ChangedHdl, weld::TreeView&, void);
    DECL_LINK(SelectionChangedHdl, weld::IconView&, void);
-    DECL_LINK(RowActivatedHdl, weld::TreeView&, bool);
+    DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool);
    DECL_LINK(ItemActivatedHdl, const weld::TreeIter&, bool);

    // IEnumerationResultHandler overridables
@@ -1334,7 +1334,7 @@ void SvtFileView_Impl::SetSelectHandler(const Link<SvtFileView*,void>& rHdl)
    mxIconView->connect_selection_changed(LINK(this, SvtFileView_Impl, SelectionChangedHdl));
 }

-IMPL_LINK_NOARG(SvtFileView_Impl, RowActivatedHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(SvtFileView_Impl, RowActivatedHdl, const weld::TreeIter&, bool)
 {
    return maDoubleClickHandler.Call(m_pAntiImpl);
 }
@@ -33,6 +33,7 @@ namespace weld { class CheckButton; }
 namespace weld { class CustomWeld; }
 namespace weld { class Expander; }
 namespace weld { class Label; }
+namespace weld { class TreeIter; }
 namespace weld { class TreeView; }
 namespace weld { class Window; }

@@ -84,7 +85,7 @@ private:

    DECL_DLLPRIVATE_LINK(RegionSelect, weld::TreeView&, void);
    DECL_DLLPRIVATE_LINK(TemplateSelect, weld::TreeView&, void);
-    DECL_DLLPRIVATE_LINK(DoubleClick, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(DoubleClick, const weld::TreeIter&, bool);
    DECL_DLLPRIVATE_LINK(Expand, weld::Expander&, void);
    sal_uInt16  GetSelectedTemplatePos() const;

@@ -55,7 +55,7 @@ private:

    std::unique_ptr<weld::MessageDialog> m_xQueryOverwriteBox;

-    DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(OKHdl, const weld::TreeIter&, bool);
    DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void);
    DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void);

@@ -63,7 +63,7 @@ private:

    void updateSelection();

-    DECL_LINK(RowActivatedHdl, weld::TreeView&, bool);
+    DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool);

    DECL_LINK(ListViewChangedHdl, weld::TreeView&, void);

@@ -179,7 +179,7 @@ private:
    std::unique_ptr<weld::Button> m_xEditBtn;

    DECL_LINK(SelectHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(DblClickHdl_Impl, weld::TreeView&, bool);
+    DECL_LINK(DblClickHdl_Impl, const weld::TreeIter&, bool);
    DECL_LINK(AddHdl_Impl, weld::Button&, void);
    DECL_LINK(RemoveHdl_Impl, weld::Button&, void);
    DECL_LINK(EditHdl_Impl, weld::Button&, void);
@@ -69,10 +69,10 @@ private:
    DECL_DLLPRIVATE_LINK(OkHdl, weld::Button&, void);
    DECL_DLLPRIVATE_LINK(SelectToolboxHdl, weld::Toggleable&, void);
    DECL_DLLPRIVATE_LINK(SelectClassificationHdl, weld::ComboBox&, void);
-    DECL_DLLPRIVATE_LINK(SelectMarkingHdl, weld::TreeView&, bool);
-    DECL_DLLPRIVATE_LINK(SelectIPPartNumbersHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(SelectMarkingHdl, const weld::TreeIter&, bool);
+    DECL_DLLPRIVATE_LINK(SelectIPPartNumbersHdl, const weld::TreeIter&, bool);
    DECL_DLLPRIVATE_LINK(SelectRecentlyUsedHdl, weld::ComboBox&, void);
-    DECL_DLLPRIVATE_LINK(SelectIPPartHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(SelectIPPartHdl, const weld::TreeIter&, bool);
    DECL_DLLPRIVATE_LINK(EditWindowModifiedHdl, LinkParamNone*, void);
    DECL_DLLPRIVATE_STATIC_LINK(ClassificationDialog, ExpandedHdl, weld::Expander&, void);
    DECL_DLLPRIVATE_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, bool);
@@ -139,7 +139,7 @@ public:
    {
        m_xControl->connect_selection_changed(rLink);
    }
-    void connect_row_activated(const Link<weld::TreeView&, bool>& rLink) { m_xControl->connect_row_activated(rLink); }
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& rLink) { m_xControl->connect_row_activated(rLink); }
    void grab_focus() { m_xControl->grab_focus(); }
    void show() { m_xControl->show(); }
    void hide() { m_xControl->hide(); }
@@ -63,7 +63,8 @@ public:

    static void trigger_row_activated(weld::TreeView& rTreeView)
    {
-        rTreeView.signal_row_activated();
+        if (std::unique_ptr<weld::TreeIter> pSelected = rTreeView.get_selected())
+            rTreeView.signal_row_activated(*pSelected);
    }

    static void trigger_popup_menu(weld::TreeView& rTreeView, const CommandEvent& rCommand)
@@ -119,7 +119,7 @@ public:

    virtual vcl::Font get_entry_font() override { return m_xEntry->get_font(); }

-    void connect_row_activated(const Link<TreeView&, bool>& rLink)
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& rLink)
    {
        m_xTreeView->connect_row_activated(rLink);
    }
@@ -42,7 +42,7 @@ public:

 private:
    Link<TreeView&, void> m_aSelectionChangedHdl;
-    Link<TreeView&, bool> m_aRowActivatedHdl;
+    Link<const weld::TreeIter&, bool> m_aRowActivatedHdl;
    Link<int, void> m_aColumnClickedHdl;
    Link<const iter_col&, void> m_aRadioToggleHdl;
    Link<const TreeIter&, bool> m_aEditingStartedHdl;
@@ -68,11 +68,11 @@ protected:
        m_aSelectionChangedHdl.Call(*this);
    }

-    bool signal_row_activated()
+    bool signal_row_activated(const weld::TreeIter& rIter)
    {
        if (notify_events_disabled())
            return true;
-        return m_aRowActivatedHdl.Call(*this);
+        return m_aRowActivatedHdl.Call(rIter);
    }

    void signal_column_clicked(int nColumn) { m_aColumnClickedHdl.Call(nColumn); }
@@ -211,7 +211,10 @@ public:
       a return of "true" means the activation has been handled, a "false" propagates
       the activation to the default handler which expands/collapses the row, if possible.
    */
-    void connect_row_activated(const Link<TreeView&, bool>& rLink) { m_aRowActivatedHdl = rLink; }
+    void connect_row_activated(const Link<const weld::TreeIter&, bool>& rLink)
+    {
+        m_aRowActivatedHdl = rLink;
+    }

    // Argument is a pair of iter, col describing the toggled node
    void connect_toggled(const Link<const iter_col&, void>& rLink) { m_aRadioToggleHdl = rLink; }
@@ -314,7 +314,7 @@ IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl, weld::TreeView&, void )
    m_xActions->set_item_sensitive(u"insert"_ustr, m_xListBox->get_selected_index() != -1);
 }

-IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl, weld::TreeView&, bool )
+IMPL_LINK_NOARG(OAddFieldWindow, OnDoubleClickHdl, const weld::TreeIter&, bool)
 {
    m_aCreateLink.Call(*this);
    return true;
@@ -65,7 +65,7 @@ class  OAddFieldWindow : public weld::GenericDialogController

    std::vector<std::unique_ptr<ColumnInfo>> m_aListBoxData;

-    DECL_LINK( OnDoubleClickHdl, weld::TreeView&, bool );
+    DECL_LINK(OnDoubleClickHdl, const weld::TreeIter&, bool);
    DECL_LINK( OnSelectHdl, weld::TreeView&, void );
    DECL_LINK( DragBeginHdl, bool&, bool );
    DECL_LINK( OnSortAction, const OUString&, void );
@@ -73,7 +73,7 @@ IMPL_LINK_NOARG(ScCheckListMenuControl::SubMenuItemData, TimeoutHdl, Timer *, vo
    mpParent->handleMenuTimeout(this);
 }

-IMPL_LINK_NOARG(ScCheckListMenuControl, RowActivatedHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScCheckListMenuControl, RowActivatedHdl, const weld::TreeIter&, bool)
 {
    int nSelectedIndex = mxMenu->get_selected_index();
    assert(nSelectedIndex >= 0 && "nothing selected");
@@ -2053,9 +2053,9 @@ IMPL_LINK(ScListSubMenuControl, ColorSelChangedHdl, weld::TreeView&, rMenu, void
    rMenu.grab_focus();
 }

-IMPL_LINK(ScListSubMenuControl, RowActivatedHdl, weld::TreeView&, rMenu, bool)
+IMPL_LINK(ScListSubMenuControl, RowActivatedHdl, const weld::TreeIter&, rIter, bool)
 {
-    executeMenuItem(rMenu);
+    executeMenuItem(rIter.getItemView());
    return true;
 }

@@ -162,7 +162,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnClickHdl, weld::Button&, void)
    Edit();
 }

-IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl, const weld::TreeIter&, bool)
 {
    Edit();
    return true;
@@ -538,7 +538,7 @@ IMPL_LINK_NOARG(ScPivotCalcFieldDlg, DeleteClicked, weld::Button&, void)
    mxBtnDel->set_sensitive(false);
 }

-IMPL_LINK_NOARG(ScPivotCalcFieldDlg, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScPivotCalcFieldDlg, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    InsertSelectedField();
    return true;
@@ -48,7 +48,7 @@ void ScPivotLayoutTreeList::Setup(ScPivotLayoutDialog* pParent, SvPivotTreeListT
    meType = eType;
 }

-IMPL_LINK_NOARG(ScPivotLayoutTreeList, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScPivotLayoutTreeList, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    int nEntry = mxControl->get_cursor_index();
    if (nEntry == -1)
@@ -78,7 +78,7 @@ ScPivotLayoutTreeListData::~ScPivotLayoutTreeListData()
    }
 }

-IMPL_LINK_NOARG(ScPivotLayoutTreeListData, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScPivotLayoutTreeListData, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    int nEntry = mxControl->get_cursor_index();
    if (nEntry == -1)
@@ -453,7 +453,7 @@ IMPL_LINK(ScDPFunctionDlg, ButtonClicked, weld::Button&, rButton, void)
        response(RET_CANCEL);
 }

-IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -571,7 +571,7 @@ IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::Toggleable&, rBtn, void)
    mxLbFunc->set_sensitive(mxRbUser->get_active());
 }

-IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -958,7 +958,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const
    return mrDPObj.GetDimName(nDim, bIsDataLayout);
 }

-IMPL_LINK_NOARG(ScDPShowDetailDlg, DblClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScDPShowDetailDlg, DblClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -330,7 +330,7 @@ IMPL_LINK_NOARG(ScImportOptionsDlg, FixedWidthHdl, weld::Toggleable&, void)
    m_xCbQuoteAll->set_sensitive( bEnable );
 }

-IMPL_LINK_NOARG(ScImportOptionsDlg, DoubleClickHdl, weld::TreeView&, bool)
+IMPL_LINK_NOARG(ScImportOptionsDlg, DoubleClickHdl, const weld::TreeIter&, bool)
 {
    m_xDialog->response(RET_OK);
    return true;
@@ -627,7 +627,7 @@ IMPL_LINK_NOARG(ScFunctionWin, SetSimilarityToggleHdl, weld::Toggleable&, void)
    SetDescription();
 }

-IMPL_LINK_NOARG( ScFunctionWin, SetRowActivatedHdl, weld::TreeView&, bool )
+IMPL_LINK_NOARG(ScFunctionWin, SetRowActivatedHdl, const weld::TreeIter&, bool)
 {
    DoEnter(true);      // saves the input
    return true;
@@ -52,7 +52,7 @@ private:
    ScFilterBoxMode eMode;
    ImplSVEvent* nAsyncSelectHdl;

-    DECL_LINK(SelectHdl, weld::TreeView&, bool);
+    DECL_LINK(SelectHdl, const weld::TreeIter&, bool);
    DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
    DECL_LINK(AsyncSelectHdl, void*, void);

--- a/Show More
+++ b/Show More