From 03d5d803c4ac999bcd474f62fda7abd2efb7aef5 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 9 Apr 2026 13:45:18 +0200 Subject: [PATCH] weld: Switch TreeView selection changed signal param to ItemView Switch the param for the signal and handlers used when the selection in a weld::TreeView changes from weld::TreeView& to the base class, weld::ItemView&. This is in preparation of moving the logic to the weld::ItemView base class in an upcoming commit. Handler implementations that require a weld::TreeView instance can use the one that the signal is connected to, e.g. use the class member directly inside of the implementation instead of using the param (as is done in most of the places anyway). Change-Id: I0bbf8fe1dbd95906a5224155d48d832bcd144532 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203366 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- basctl/source/basicide/ColorSchemeDialog.cxx | 2 +- basctl/source/basicide/baside2.hxx | 4 ++-- basctl/source/basicide/baside2b.cxx | 4 ++-- basctl/source/basicide/macrodlg.cxx | 4 ++-- basctl/source/basicide/macrodlg.hxx | 4 ++-- basctl/source/basicide/moduldl2.cxx | 5 +---- basctl/source/basicide/moduldlg.cxx | 5 +---- basctl/source/basicide/moduldlg.hxx | 4 ++-- basctl/source/basicide/objectbrowser.cxx | 10 +++++----- basctl/source/dlged/managelang.cxx | 2 +- basctl/source/inc/ColorSchemeDialog.hxx | 2 +- basctl/source/inc/bastype2.hxx | 2 +- basctl/source/inc/managelang.hxx | 2 +- basctl/source/inc/objectbrowser.hxx | 4 ++-- .../source/controller/dialogs/ChartResourceGroups.cxx | 2 +- chart2/source/controller/dialogs/res_BarGeometry.cxx | 2 +- chart2/source/controller/dialogs/tp_ChartType.cxx | 5 +---- chart2/source/controller/dialogs/tp_ChartType.hxx | 8 ++++++-- chart2/source/controller/dialogs/tp_DataSource.cxx | 4 ++-- chart2/source/controller/dialogs/tp_DataSource.hxx | 5 +++-- chart2/source/inc/ChartResourceGroups.hxx | 2 +- chart2/source/inc/res_BarGeometry.hxx | 2 +- cui/source/customize/SvxMenuConfigPage.cxx | 2 +- cui/source/customize/SvxToolbarConfigPage.cxx | 2 +- cui/source/customize/acccfg.cxx | 2 +- cui/source/customize/cfg.cxx | 4 ++-- cui/source/customize/cfgutil.cxx | 2 +- cui/source/customize/macropg.cxx | 2 +- cui/source/dialogs/MacroManagerDialog.cxx | 2 +- cui/source/dialogs/cuigaldlg.cxx | 2 +- cui/source/dialogs/hangulhanjadlg.cxx | 4 ++-- cui/source/dialogs/linkdlg.cxx | 2 +- cui/source/dialogs/multipat.cxx | 4 ++-- cui/source/dialogs/pastedlg.cxx | 2 +- cui/source/dialogs/scriptdlg.cxx | 2 +- cui/source/dialogs/thesdlg.cxx | 2 +- cui/source/inc/MacroManagerDialog.hxx | 6 +++--- cui/source/inc/SvxMenuConfigPage.hxx | 2 +- cui/source/inc/SvxToolbarConfigPage.hxx | 2 +- cui/source/inc/acccfg.hxx | 2 +- cui/source/inc/autocdlg.hxx | 8 ++++---- cui/source/inc/cfg.hxx | 4 ++-- cui/source/inc/cfgutil.hxx | 6 +++--- cui/source/inc/chardlg.hxx | 4 ++-- cui/source/inc/cuigaldlg.hxx | 2 +- cui/source/inc/dbregister.hxx | 2 +- cui/source/inc/hangulhanjadlg.hxx | 4 ++-- cui/source/inc/linkdlg.hxx | 2 +- cui/source/inc/macroass.hxx | 6 +++--- cui/source/inc/macropg.hxx | 2 +- cui/source/inc/multipat.hxx | 4 ++-- cui/source/inc/numfmt.hxx | 2 +- cui/source/inc/numpages.hxx | 4 ++-- cui/source/inc/optdict.hxx | 2 +- cui/source/inc/optlingu.hxx | 4 ++-- cui/source/inc/optpath.hxx | 2 +- cui/source/inc/pastedlg.hxx | 2 +- cui/source/inc/scriptdlg.hxx | 2 +- cui/source/inc/thesdlg.hxx | 2 +- cui/source/inc/treeopt.hxx | 2 +- cui/source/options/connpooloptions.cxx | 2 +- cui/source/options/connpooloptions.hxx | 2 +- cui/source/options/dbregister.cxx | 2 +- cui/source/options/fontsubs.cxx | 2 +- cui/source/options/fontsubs.hxx | 2 +- cui/source/options/optchart.cxx | 2 +- cui/source/options/optchart.hxx | 2 +- cui/source/options/optdict.cxx | 9 +++++---- cui/source/options/optjava.cxx | 6 +++--- cui/source/options/optjava.hxx | 6 +++--- cui/source/options/optlingu.cxx | 4 ++-- cui/source/options/optpath.cxx | 2 +- cui/source/options/treeopt.cxx | 2 +- cui/source/options/tsaurls.cxx | 2 +- cui/source/options/tsaurls.hxx | 2 +- cui/source/options/webconninfo.cxx | 3 +-- cui/source/options/webconninfo.hxx | 2 +- cui/source/tabpages/autocdlg.cxx | 8 ++++---- cui/source/tabpages/chardlg.cxx | 6 +++--- cui/source/tabpages/macroass.cxx | 6 +++--- cui/source/tabpages/numfmt.cxx | 5 +++-- cui/source/tabpages/numpages.cxx | 4 ++-- dbaccess/source/ui/app/AppDetailView.cxx | 2 +- dbaccess/source/ui/app/AppDetailView.hxx | 2 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 2 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 2 +- dbaccess/source/ui/dlg/dbfindex.cxx | 2 +- dbaccess/source/ui/dlg/dbfindex.hxx | 2 +- dbaccess/source/ui/dlg/indexdialog.cxx | 2 +- dbaccess/source/ui/dlg/paramdialog.cxx | 2 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 4 ++-- dbaccess/source/ui/inc/WNameMatch.hxx | 4 ++-- dbaccess/source/ui/inc/WTypeSelect.hxx | 6 +++--- dbaccess/source/ui/inc/adtabdlg.hxx | 2 +- dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 +- dbaccess/source/ui/inc/indexdialog.hxx | 2 +- dbaccess/source/ui/inc/paramdialog.hxx | 2 +- dbaccess/source/ui/misc/WNameMatch.cxx | 4 ++-- dbaccess/source/ui/misc/WTypeSelect.cxx | 2 +- desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 3 +-- desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2 +- extensions/source/abpilot/tableselectionpage.cxx | 2 +- extensions/source/abpilot/tableselectionpage.hxx | 2 +- extensions/source/dbpilots/commonpagesdbp.cxx | 2 +- extensions/source/dbpilots/commonpagesdbp.hxx | 2 +- extensions/source/dbpilots/gridwizard.cxx | 2 +- extensions/source/dbpilots/gridwizard.hxx | 2 +- extensions/source/dbpilots/groupboxwiz.cxx | 4 ++-- extensions/source/dbpilots/groupboxwiz.hxx | 4 ++-- extensions/source/dbpilots/listcombowizard.cxx | 4 ++-- extensions/source/dbpilots/listcombowizard.hxx | 4 ++-- extensions/source/propctrlr/selectlabeldialog.cxx | 2 +- extensions/source/propctrlr/selectlabeldialog.hxx | 2 +- extensions/source/scanner/sanedlg.cxx | 2 +- extensions/source/scanner/sanedlg.hxx | 2 +- filter/source/pdf/impdialog.cxx | 2 +- filter/source/pdf/impdialog.hxx | 2 +- filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2 +- filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 2 +- formula/source/ui/dlg/funcpage.cxx | 2 +- formula/source/ui/dlg/funcpage.hxx | 2 +- formula/source/ui/dlg/structpg.cxx | 2 +- formula/source/ui/dlg/structpg.hxx | 2 +- fpicker/source/office/PlacesListBox.cxx | 2 +- fpicker/source/office/PlacesListBox.hxx | 2 +- fpicker/source/office/RemoteFilesDialog.cxx | 4 ++-- fpicker/source/office/RemoteFilesDialog.hxx | 2 +- fpicker/source/office/fileview.cxx | 6 +++--- fpicker/source/office/foldertree.hxx | 2 +- include/sfx2/devtools/ObjectInspectorTreeHandler.hxx | 6 ++---- include/sfx2/new.hxx | 5 +++-- include/sfx2/templatedlg.hxx | 2 +- include/sfx2/templatedlglocalview.hxx | 2 +- include/svtools/dlgname.hxx | 2 +- include/svx/dialog/TableAutoFmtDlg.hxx | 2 +- include/vcl/weld/EntryTreeView.hxx | 2 +- include/vcl/weld/TreeView.hxx | 4 ++-- reportdesign/source/ui/dlg/AddField.cxx | 2 +- reportdesign/source/ui/dlg/Navigator.cxx | 4 ++-- reportdesign/source/ui/inc/AddField.hxx | 2 +- sc/source/ui/cctrl/checklistmenu.cxx | 4 ++-- sc/source/ui/dbgui/PivotCalcFieldDialog.cxx | 2 +- sc/source/ui/dbgui/consdlg.cxx | 2 +- sc/source/ui/dbgui/tpsubt.cxx | 2 +- sc/source/ui/dialogs/SelectSheetViewDialog.cxx | 2 +- sc/source/ui/dialogs/searchresults.cxx | 2 +- sc/source/ui/formdlg/dwfunctr.cxx | 2 +- sc/source/ui/inc/PivotCalcFieldDialog.hxx | 2 +- sc/source/ui/inc/acredlin.hxx | 2 +- sc/source/ui/inc/checklistmenu.hxx | 4 ++-- sc/source/ui/inc/conflictsdlg.hxx | 2 +- sc/source/ui/inc/consdlg.hxx | 2 +- sc/source/ui/inc/crnrdlg.hxx | 2 +- sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx | 2 +- sc/source/ui/inc/dwfunctr.hxx | 2 +- sc/source/ui/inc/instbdlg.hxx | 2 +- sc/source/ui/inc/linkarea.hxx | 2 +- sc/source/ui/inc/namedlg.hxx | 2 +- sc/source/ui/inc/namemgrtable.hxx | 2 +- sc/source/ui/inc/navipi.hxx | 2 +- sc/source/ui/inc/searchresults.hxx | 2 +- sc/source/ui/inc/solveroptions.hxx | 2 +- sc/source/ui/inc/tpsubt.hxx | 2 +- sc/source/ui/inc/tpusrlst.hxx | 2 +- sc/source/ui/inc/xmlsourcedlg.hxx | 2 +- sc/source/ui/miscdlgs/acredlin.cxx | 2 +- sc/source/ui/miscdlgs/conflictsdlg.cxx | 2 +- sc/source/ui/miscdlgs/crnrdlg.cxx | 2 +- sc/source/ui/miscdlgs/instbdlg.cxx | 2 +- sc/source/ui/miscdlgs/linkarea.cxx | 2 +- sc/source/ui/miscdlgs/solveroptions.cxx | 2 +- sc/source/ui/namedlg/namedlg.cxx | 2 +- sc/source/ui/navipi/scenwnd.cxx | 2 +- sc/source/ui/optdlg/tpusrlst.cxx | 2 +- sc/source/ui/xmlsource/xmlsourcedlg.cxx | 2 +- sd/source/ui/animations/CustomAnimationList.cxx | 2 +- sd/source/ui/animations/CustomAnimationPane.cxx | 2 +- sd/source/ui/dlg/BulletAndPositionDlg.cxx | 2 +- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 +- sd/source/ui/dlg/PhotoAlbumDialog.hxx | 2 +- sd/source/ui/dlg/SelectLayerDlg.cxx | 2 +- sd/source/ui/dlg/custsdlg.cxx | 6 +++--- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/inc/BulletAndPositionDlg.hxx | 2 +- sd/source/ui/inc/CustomAnimationList.hxx | 2 +- sd/source/ui/inc/CustomAnimationPane.hxx | 2 +- sd/source/ui/inc/SelectLayerDlg.hxx | 2 +- sd/source/ui/inc/custsdlg.hxx | 6 +++--- sd/source/ui/inc/sdtreelb.hxx | 2 +- sfx2/inc/DevelopmentToolDockingWindow.hxx | 2 +- sfx2/inc/saveastemplatedlg.hxx | 2 +- sfx2/source/appl/newhelp.cxx | 2 +- sfx2/source/appl/newhelp.hxx | 2 +- sfx2/source/control/templatedlglocalview.cxx | 2 +- sfx2/source/devtools/DevelopmentToolDockingWindow.cxx | 2 +- sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 4 ++-- sfx2/source/dialog/StyleList.cxx | 5 +++-- sfx2/source/dialog/versdlg.cxx | 2 +- sfx2/source/doc/new.cxx | 4 ++-- sfx2/source/doc/saveastemplatedlg.cxx | 2 +- sfx2/source/doc/templatedlg.cxx | 2 +- sfx2/source/inc/StyleList.hxx | 2 +- sfx2/source/inc/versdlg.hxx | 2 +- svtools/source/dialogs/dlgname.cxx | 2 +- svx/source/dialog/TableAutoFmtDlg.cxx | 2 +- svx/source/form/datanavi.cxx | 4 ++-- svx/source/form/filtnav.cxx | 2 +- svx/source/form/navigatortree.cxx | 2 +- svx/source/gallery2/galbrws1.cxx | 4 ++-- svx/source/inc/datanavi.hxx | 4 ++-- svx/source/inc/filtnav.hxx | 2 +- svx/source/inc/fmexpl.hxx | 2 +- svx/source/inc/galbrws1.hxx | 4 ++-- .../textconversiondlgs/chinese_dictionarydialog.cxx | 2 +- .../textconversiondlgs/chinese_dictionarydialog.hxx | 4 ++-- sw/source/ui/chrdlg/swuiccoll.cxx | 2 +- sw/source/ui/config/optload.cxx | 2 +- sw/source/ui/dbui/addresslistdialog.cxx | 2 +- sw/source/ui/dbui/addresslistdialog.hxx | 2 +- sw/source/ui/dbui/customizeaddresslistdialog.cxx | 2 +- sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2 +- sw/source/ui/dbui/dbinsdlg.cxx | 2 +- sw/source/ui/dbui/mmaddressblockpage.cxx | 2 +- sw/source/ui/dbui/mmaddressblockpage.hxx | 2 +- sw/source/ui/dialog/uiregionsw.cxx | 3 +-- sw/source/ui/fldui/DropDownFormFieldDialog.cxx | 2 +- sw/source/ui/fldui/changedb.cxx | 4 ++-- sw/source/ui/fldui/flddb.cxx | 6 +++--- sw/source/ui/fldui/flddb.hxx | 6 +++--- sw/source/ui/fldui/flddinf.cxx | 4 ++-- sw/source/ui/fldui/flddinf.hxx | 4 ++-- sw/source/ui/fldui/flddok.cxx | 8 ++++---- sw/source/ui/fldui/flddok.hxx | 6 +++--- sw/source/ui/fldui/fldfunc.cxx | 6 +++--- sw/source/ui/fldui/fldfunc.hxx | 6 +++--- sw/source/ui/fldui/fldref.cxx | 8 ++++---- sw/source/ui/fldui/fldref.hxx | 8 ++++---- sw/source/ui/fldui/fldvar.cxx | 6 +++--- sw/source/ui/fldui/fldvar.hxx | 6 +++--- sw/source/ui/inc/bookmark.hxx | 4 ++-- sw/source/ui/inc/regionsw.hxx | 2 +- sw/source/ui/index/cnttab.cxx | 6 +++--- sw/source/ui/index/multmrk.cxx | 2 +- sw/source/ui/misc/bookmark.cxx | 2 +- sw/source/ui/misc/contentcontroldlg.cxx | 2 +- sw/source/ui/misc/glosbib.cxx | 2 +- sw/source/ui/misc/glossary.cxx | 2 +- sw/source/ui/misc/num.cxx | 2 +- sw/source/ui/misc/outline.cxx | 6 +++--- sw/source/ui/table/convert.cxx | 2 +- sw/source/ui/table/instable.cxx | 2 +- sw/source/uibase/inc/DropDownFormFieldDialog.hxx | 2 +- sw/source/uibase/inc/QuickFindPanel.hxx | 2 +- sw/source/uibase/inc/changedb.hxx | 2 +- sw/source/uibase/inc/contentcontroldlg.hxx | 2 +- sw/source/uibase/inc/conttree.hxx | 4 ++-- sw/source/uibase/inc/convert.hxx | 2 +- sw/source/uibase/inc/dbinsdlg.hxx | 2 +- sw/source/uibase/inc/dbtree.hxx | 2 +- sw/source/uibase/inc/glosbib.hxx | 2 +- sw/source/uibase/inc/glossary.hxx | 2 +- sw/source/uibase/inc/instable.hxx | 2 +- sw/source/uibase/inc/multmrk.hxx | 2 +- sw/source/uibase/inc/num.hxx | 2 +- sw/source/uibase/inc/numfmtlb.hxx | 2 +- sw/source/uibase/inc/optload.hxx | 2 +- sw/source/uibase/inc/outline.hxx | 3 ++- sw/source/uibase/inc/redlndlg.hxx | 2 +- sw/source/uibase/inc/swuiccoll.hxx | 2 +- sw/source/uibase/inc/swuicnttab.hxx | 6 +++--- sw/source/uibase/misc/redlndlg.cxx | 4 ++-- sw/source/uibase/sidebar/QuickFindPanel.cxx | 2 +- sw/source/uibase/utlui/content.cxx | 2 +- sw/source/uibase/utlui/glbltree.cxx | 2 +- sw/source/uibase/utlui/gloslst.cxx | 4 ++-- sw/source/uibase/utlui/numfmtlb.cxx | 2 +- vcl/source/weld/EntryTreeView.cxx | 2 +- vcl/unx/generic/print/prtsetup.cxx | 2 +- vcl/unx/generic/print/prtsetup.hxx | 2 +- xmlsecurity/inc/certificatechooser.hxx | 2 +- xmlsecurity/inc/certificateviewer.hxx | 4 ++-- xmlsecurity/inc/digitalsignaturesdialog.hxx | 2 +- xmlsecurity/inc/macrosecurity.hxx | 4 ++-- xmlsecurity/source/dialogs/certificatechooser.cxx | 2 +- xmlsecurity/source/dialogs/certificateviewer.cxx | 4 ++-- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +- xmlsecurity/source/dialogs/macrosecurity.cxx | 4 ++-- 287 files changed, 415 insertions(+), 419 deletions(-) diff --git a/basctl/source/basicide/ColorSchemeDialog.cxx b/basctl/source/basicide/ColorSchemeDialog.cxx index 87a6eee39691..f2cf62d97c04 100644 --- a/basctl/source/basicide/ColorSchemeDialog.cxx +++ b/basctl/source/basicide/ColorSchemeDialog.cxx @@ -135,7 +135,7 @@ IMPL_LINK_NOARG(ColorSchemeDialog, OptionHdl, weld::Toggleable&, void) } } -IMPL_LINK_NOARG(ColorSchemeDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ColorSchemeDialog, SelectHdl, weld::ItemView&, void) { // Apply the selected scheme only for the current ModulWinLayout for preview // Only if the user presses OK the scheme will be applied to all ModulWinLayout(s) diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 5405ad781408..ed8f562e5e6f 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -224,7 +224,7 @@ private: void implEnableChildren(const weld::TreeIter& rEntry, bool bEnable); DECL_STATIC_LINK(WatchWindow, ButtonHdl, weld::Button&, void); - DECL_LINK(TreeListHdl, weld::TreeView&, void); + DECL_LINK(TreeListHdl, weld::ItemView&, void); DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool); DECL_LINK(ActivateHdl, weld::Entry&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); @@ -500,7 +500,7 @@ private: TextView* GetParentEditView(); DECL_LINK(ImplDoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(ImplSelectHdl, weld::TreeView&, void); + DECL_LINK(ImplSelectHdl, weld::ItemView&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); public: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 05a641d83a01..dcf364f573fe 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1875,7 +1875,7 @@ IMPL_STATIC_LINK_NOARG(WatchWindow, ButtonHdl, weld::Button&, void) pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH); } -IMPL_LINK_NOARG(WatchWindow, TreeListHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(WatchWindow, TreeListHdl, weld::ItemView&, void) { std::unique_ptr xCurEntry = m_xTreeListBox->get_cursor(); if (!xCurEntry) @@ -2671,7 +2671,7 @@ IMPL_LINK_NOARG(CodeCompleteWindow, ImplDoubleClickHdl, const weld::TreeIter&, b return true; } -IMPL_LINK_NOARG(CodeCompleteWindow, ImplSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CodeCompleteWindow, ImplSelectHdl, weld::ItemView&, void) { //give back the focus to the parent pParent->GrabFocus(); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 62c147c0337f..c7a2b6dc4076 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -483,13 +483,13 @@ IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(MacroChooser, MacroSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(MacroChooser, MacroSelectHdl, weld::ItemView&, void) { UpdateFields(); CheckButtons(); } -IMPL_LINK_NOARG(MacroChooser, BasicSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(MacroChooser, BasicSelectHdl, weld::ItemView&, void) { SbModule* pModule = nullptr; if (std::unique_ptr pCursor = m_xBasicBox->get_cursor()) diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index c33ff58f72df..3073c2cf35e6 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -56,9 +56,9 @@ private: Mode nMode; - DECL_LINK(MacroSelectHdl, weld::TreeView&, void); + DECL_LINK(MacroSelectHdl, weld::ItemView&, void); DECL_LINK(MacroDoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(BasicSelectHdl, weld::TreeView&, void); + DECL_LINK(BasicSelectHdl, weld::ItemView&, void); DECL_LINK(EditModifyHdl, weld::Entry&, void); DECL_LINK(ContextMenuHdl, const CommandEvent&, bool); DECL_LINK(ButtonHdl, weld::Button&, void); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index e34e248ea08c..9cd98baa4a38 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -430,10 +430,7 @@ void LibPage::ActivatePage() SetCurLib(); } -IMPL_LINK_NOARG(LibPage, TreeListHighlightHdl, weld::TreeView&, void) -{ - CheckButtons(); -} +IMPL_LINK_NOARG(LibPage, TreeListHighlightHdl, weld::ItemView&, void) { CheckButtons(); } IMPL_LINK_NOARG( LibPage, BasicSelectHdl, weld::ComboBox&, void ) { diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 25bd4cb6f2bb..b23a703d7de9 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -677,10 +677,7 @@ void ObjectPage::CheckButtons() m_xDelButton->set_sensitive(false); } -IMPL_LINK_NOARG(ObjectPage, BasicBoxHighlightHdl, weld::TreeView&, void) -{ - CheckButtons(); -} +IMPL_LINK_NOARG(ObjectPage, BasicBoxHighlightHdl, weld::ItemView&, void) { CheckButtons(); } IMPL_LINK(ObjectPage, ButtonHdl, weld::Button&, rButton, void) { diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 6e8c3235bf0a..e6d6893004d9 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -145,7 +145,7 @@ class ObjectPage final : public OrganizePage std::unique_ptr m_xDelButton; std::unique_ptr m_xDropTarget; - DECL_LINK( BasicBoxHighlightHdl, weld::TreeView&, void ); + DECL_LINK(BasicBoxHighlightHdl, weld::ItemView&, void); DECL_LINK( ButtonHdl, weld::Button&, void ); DECL_LINK( EditingEntryHdl, const weld::TreeIter&, bool ); typedef std::pair IterString; @@ -181,7 +181,7 @@ class LibPage final : public OrganizePage ScriptDocument m_aCurDocument; LibraryLocation m_eCurLocation; - DECL_LINK( TreeListHighlightHdl, weld::TreeView&, void ); + DECL_LINK(TreeListHighlightHdl, weld::ItemView&, void); DECL_LINK( BasicSelectHdl, weld::ComboBox&, void ); DECL_LINK( ButtonHdl, weld::Button&, void ); DECL_LINK( CheckPasswordHdl, SvxPasswordDialog *, bool ); diff --git a/basctl/source/basicide/objectbrowser.cxx b/basctl/source/basicide/objectbrowser.cxx index 6cbc22b22552..720d7ffbeef9 100644 --- a/basctl/source/basicide/objectbrowser.cxx +++ b/basctl/source/basicide/objectbrowser.cxx @@ -107,7 +107,7 @@ bool IsExpandable(const IdeSymbolInfo& rSymbol) } std::shared_ptr -GetSymbolForIter(const weld::TreeIter& rIter, const weld::TreeView& rTree, +GetSymbolForIter(const weld::TreeIter& rIter, const weld::ItemView& rTree, const std::map>& rIndex) { const OUString sId = rTree.get_id(rIter); @@ -727,12 +727,12 @@ void ObjectBrowser::dispose() m_xScopeSelector->connect_changed(Link()); if (m_xLeftTreeView) { - m_xLeftTreeView->connect_selection_changed(Link()); + m_xLeftTreeView->connect_selection_changed(Link()); m_xLeftTreeView->connect_expanding(Link()); } if (m_xRightMembersView) { - m_xRightMembersView->connect_selection_changed(Link()); + m_xRightMembersView->connect_selection_changed(Link()); } m_pDocNotifier->dispose(); @@ -1138,7 +1138,7 @@ void ObjectBrowser::onDocumentClosed(const ScriptDocument&) { ScheduleRefresh(); void ObjectBrowser::onDocumentTitleChanged(const ScriptDocument&) { ScheduleRefresh(); } void ObjectBrowser::onDocumentModeChanged(const ScriptDocument&) { /* STUB */} -IMPL_LINK(ObjectBrowser, OnLeftTreeSelect, weld::TreeView&, rTree, void) +IMPL_LINK(ObjectBrowser, OnLeftTreeSelect, weld::ItemView&, rTree, void) { if (m_bDisposed) { @@ -1171,7 +1171,7 @@ IMPL_LINK(ObjectBrowser, OnLeftTreeSelect, weld::TreeView&, rTree, void) } } -IMPL_LINK(ObjectBrowser, OnRightTreeSelect, weld::TreeView&, rTree, void) +IMPL_LINK(ObjectBrowser, OnRightTreeSelect, weld::ItemView&, rTree, void) { if (m_bDisposed) { diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index d239154cadfd..dc32332aff37 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -198,7 +198,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, weld::Button&, void) } } -IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, weld::ItemView&, void) { const sal_Int32 nCount = m_xLanguageLB->n_children(); bool bEmpty = ( !nCount || diff --git a/basctl/source/inc/ColorSchemeDialog.hxx b/basctl/source/inc/ColorSchemeDialog.hxx index d677f642c093..94628c40029b 100644 --- a/basctl/source/inc/ColorSchemeDialog.hxx +++ b/basctl/source/inc/ColorSchemeDialog.hxx @@ -44,7 +44,7 @@ private: DECL_LINK(BtnOkHdl, weld::Button&, void); DECL_LINK(OptionHdl, weld::Toggleable&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: ColorSchemeDialog(weld::Window* pParent, VclPtr pModulWinLayout); diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx index 09e7745e6925..6d0b2d642887 100644 --- a/basctl/source/inc/bastype2.hxx +++ b/basctl/source/inc/bastype2.hxx @@ -240,7 +240,7 @@ public: std::unique_ptr&& rUserData, weld::TreeIter* pRet = nullptr); - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xControl->connect_selection_changed(rLink); } diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 732a875e38ad..24b9b2b6c190 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -65,7 +65,7 @@ private: DECL_LINK(AddHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); DECL_LINK(MakeDefHdl, weld::Button&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: ManageLanguageDialog(weld::Window* pParent, std::shared_ptr _pLMgr); diff --git a/basctl/source/inc/objectbrowser.hxx b/basctl/source/inc/objectbrowser.hxx index 331b6ac0b01c..b9cbabc84079 100644 --- a/basctl/source/inc/objectbrowser.hxx +++ b/basctl/source/inc/objectbrowser.hxx @@ -129,8 +129,8 @@ private: std::unique_ptr m_pDocNotifier; // UI Event Handlers - DECL_LINK(OnLeftTreeSelect, weld::TreeView&, void); - DECL_LINK(OnRightTreeSelect, weld::TreeView&, void); + DECL_LINK(OnLeftTreeSelect, weld::ItemView&, void); + DECL_LINK(OnRightTreeSelect, weld::ItemView&, void); DECL_LINK(OnRightNodeExpand, const weld::TreeIter&, bool); DECL_LINK(OnRightTreeDoubleClick, const weld::TreeIter&, bool); DECL_LINK(OnNodeExpand, const weld::TreeIter&, bool); diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx index c364433c5d1f..e2f34c9ea0ef 100644 --- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx +++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx @@ -382,7 +382,7 @@ void GeometryResourceGroup::fillParameter(ChartTypeParameter& rParameter) rParameter.nGeometry3D = nSelected; } -IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::ItemView&, void) { if (m_pChangeListener) m_pChangeListener->stateChanged(); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 927906b06915..e1f143613294 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -32,7 +32,7 @@ BarGeometryResources::BarGeometryResources(weld::Builder* pBuilder) m_xLB_Geometry->set_size_request(-1, m_xLB_Geometry->get_height_rows(std::size(CHART_TYPE))); } -void BarGeometryResources::connect_changed(const Link& rLink) +void BarGeometryResources::connect_changed(const Link& rLink) { m_xLB_Geometry->connect_selection_changed(rLink); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 11c34d6498b5..49ef2d996069 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -227,10 +227,7 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) } } -IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, weld::TreeView&, void) -{ - selectMainType(); -} +IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, weld::ItemView&, void) { selectMainType(); } void ChartTypeTabPage::selectMainType() { diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 946beb836e1a..37d38bfd592c 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -27,7 +27,11 @@ #include -namespace weld { class CustomWeld; } +namespace weld +{ +class CustomWeld; +class ItemView; +} class ValueSet; @@ -64,7 +68,7 @@ private: void commitToModel( const ChartTypeParameter& rParameter ); void selectMainType(); - DECL_LINK(SelectMainTypeHdl, weld::TreeView&, void); + DECL_LINK(SelectMainTypeHdl, weld::ItemView&, void); DECL_LINK(SelectSubTypeHdl, ValueSet*, void ); std::unique_ptr m_pDim3DLookResourceGroup; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 2faa1ab32871..c51eb4d508cc 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -451,7 +451,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, weld::ItemView&, void) { m_rDialogModel.startControllerLockTimer(); if (m_xLB_SERIES->get_selected_index() != -1) @@ -462,7 +462,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, weld::TreeView&, v updateControlState(); } -IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, weld::ItemView&, void) { m_rDialogModel.startControllerLockTimer(); int nEntry = m_xLB_ROLE->get_selected_index(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index ac3992e5bc94..e391cb674ffc 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -23,6 +23,7 @@ #include #include +#include #include @@ -69,8 +70,8 @@ private: virtual void initializePage() override; - DECL_LINK( SeriesSelectionChangedHdl, weld::TreeView&, void ); - DECL_LINK( RoleSelectionChangedHdl, weld::TreeView&, void ); + DECL_LINK(SeriesSelectionChangedHdl, weld::ItemView&, void); + DECL_LINK(RoleSelectionChangedHdl, weld::ItemView&, void); DECL_LINK( MainRangeButtonClickedHdl, weld::Button&, void ); DECL_LINK( CategoriesRangeButtonClickedHdl, weld::Button&, void ); DECL_LINK( AddButtonClickedHdl, weld::Button&, void ); diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx index a3ce6f564cc2..18a1301ccf9e 100644 --- a/chart2/source/inc/ChartResourceGroups.hxx +++ b/chart2/source/inc/ChartResourceGroups.hxx @@ -140,7 +140,7 @@ public: void fillParameter(ChartTypeParameter& rParameter); private: - DECL_LINK(GeometryChangeHdl, weld::TreeView&, void); + DECL_LINK(GeometryChangeHdl, weld::ItemView&, void); private: BarGeometryResources m_aGeometryResources; diff --git a/chart2/source/inc/res_BarGeometry.hxx b/chart2/source/inc/res_BarGeometry.hxx index 20d20e6241d0..65d42ec88f0c 100644 --- a/chart2/source/inc/res_BarGeometry.hxx +++ b/chart2/source/inc/res_BarGeometry.hxx @@ -35,7 +35,7 @@ public: sal_Int32 get_selected_index() const; void select(sal_Int32 nPos); - void connect_changed(const Link& rLink); + void connect_changed(const Link& rLink); private: std::unique_ptr m_xFT_Geometry; diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 25173630f79f..ed86353e382d 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -150,7 +150,7 @@ void SvxMenuConfigPage::Init() SelectFunctionHdl(m_xFunctions->get_widget()); } -IMPL_LINK_NOARG(SvxMenuConfigPage, SelectMenuEntry, weld::TreeView&, void) { UpdateButtonStates(); } +IMPL_LINK_NOARG(SvxMenuConfigPage, SelectMenuEntry, weld::ItemView&, void) { UpdateButtonStates(); } void SvxMenuConfigPage::UpdateButtonStates() { diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 4b1958d15b4c..12400ee7e191 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -293,7 +293,7 @@ SaveInData* SvxToolbarConfigPage::CreateSaveInData( new ToolbarSaveInData(xCfgMgr, xParentCfgMgr, aModuleId, bDocConfig)); } -IMPL_LINK_NOARG(SvxToolbarConfigPage, SelectToolbarEntry, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxToolbarConfigPage, SelectToolbarEntry, weld::ItemView&, void) { UpdateButtonStates(); } diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 32b3f751188b..6f413b570e63 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1328,7 +1328,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl, weld::Button&, void) SelectHdl(m_xFunctionBox->get_widget()); } -IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::TreeView&, rListBox, void) +IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::ItemView&, rListBox, void) { const std::vector& rAssignments = GetAssignments(); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 77a740fc840c..931f064eb18e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1651,7 +1651,7 @@ IMPL_LINK_NOARG(SvxConfigPage, FunctionDoubleClickHdl, const weld::TreeIter&, bo return true; } -IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, weld::ItemView&, void) { // GetScriptURL() returns a non-empty string if a // valid command is selected on the left box @@ -1885,7 +1885,7 @@ IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl, weld::Entry&, void) m_xMenuListBox->select(nOldSelection); } -IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, SelectHdl, weld::ItemView&, void) { UpdateButtonStates(); } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 9087c4f28582..b6af7201dd3a 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1209,7 +1209,7 @@ SvxScriptSelectorDialog::~SvxScriptSelectorDialog() { } -IMPL_LINK(SvxScriptSelectorDialog, SelectHdl, weld::TreeView&, rCtrl, void) +IMPL_LINK(SvxScriptSelectorDialog, SelectHdl, weld::ItemView&, rCtrl, void) { if (&rCtrl == &m_xCategories->get_widget()) { diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e6837d79eda1..63677a8a234d 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -374,7 +374,7 @@ void SvxMacroTabPage_::DisplayAppEvents(bool appEvents, int nSelectIndex) } // select event handler on the listbox -IMPL_LINK_NOARG( SvxMacroTabPage_, SelectEvent_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxMacroTabPage_, SelectEvent_Impl, weld::ItemView&, void) { int nEntry = mpImpl->xEventLB->get_selected_index(); diff --git a/cui/source/dialogs/MacroManagerDialog.cxx b/cui/source/dialogs/MacroManagerDialog.cxx index 73911e6b387c..bdc4ca25ff0e 100644 --- a/cui/source/dialogs/MacroManagerDialog.cxx +++ b/cui/source/dialogs/MacroManagerDialog.cxx @@ -817,7 +817,7 @@ void MacroManagerDialog::Notify(SfxBroadcaster&, const SfxHint& rHint) } } -IMPL_LINK(MacroManagerDialog, SelectHdl, weld::TreeView&, rItemView, void) +IMPL_LINK(MacroManagerDialog, SelectHdl, weld::ItemView&, rItemView, void) { weld::TreeView& rTreeView = m_xScriptContainersListBox->get_widget(); if (&rItemView == &rTreeView) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 886ed9556f57..ac0bf791a1c2 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -935,7 +935,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl, weld::Button&, void) } } -IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, weld::ItemView&, void) { if (!bInputAllowed) return; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index e82ac6ecc8cf..a1760aa67656 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -352,7 +352,7 @@ namespace svx SelectSuggestionHdl(false); } - IMPL_LINK_NOARG(SuggestionDisplay, SelectSuggestionListBoxHdl, weld::TreeView&, void) + IMPL_LINK_NOARG(SuggestionDisplay, SelectSuggestionListBoxHdl, weld::ItemView&, void) { SelectSuggestionHdl(true); } @@ -801,7 +801,7 @@ namespace svx m_xDialog->response(RET_OK); } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl, weld::TreeView&, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl, weld::ItemView&, void) { bool bSel = m_xDictsLB->get_selected_index() != -1; diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 84f0ce950b84..0f34fe753ce8 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -140,7 +140,7 @@ SvBaseLinksDlg::~SvBaseLinksDlg() /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ -IMPL_LINK_NOARG(SvBaseLinksDlg, LinksSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvBaseLinksDlg, LinksSelectHdl, weld::ItemView&, void) { LinksSelectHdl(m_xTbLinks.get()); } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index e8c2cc7cc31d..f071fb426284 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, weld::ItemView&, void) { auto nCount = m_xRadioLB->n_children(); bool bIsSelected = m_xRadioLB->get_selected_index() != -1; @@ -51,7 +51,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, weld::TreeView&, void) m_xDelBtn->set_sensitive(bEnable && bIsSelected); } -IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, weld::ItemView&, void) { auto nCount = m_xPathLB->n_children(); bool bIsSelected = m_xPathLB->get_selected_index() != -1; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 857bb2aebb3c..9383a99a11a7 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -55,7 +55,7 @@ void SvPasteObjectDialog::SelectObject() } } -IMPL_LINK_NOARG(SvPasteObjectDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvPasteObjectDialog, SelectHdl, weld::ItemView&, void) { if (!m_xOKButton->get_sensitive()) m_xOKButton->set_sensitive(true); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2e650ac586c2..7c7f980f221a 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -526,7 +526,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode > const & } } -IMPL_LINK_NOARG(SvxScriptOrgDialog, ScriptSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxScriptOrgDialog, ScriptSelectHdl, weld::ItemView&, void) { std::unique_ptr xIter = m_xScriptsBox->get_selected(); if (!xIter) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 11e88643c22c..7d7ad82d7a21 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -180,7 +180,7 @@ IMPL_LINK_NOARG(SvxThesaurusDialog, WordSelectHdl_Impl, weld::ComboBox&, void) m_aModifyIdle.Start(); } -IMPL_LINK_NOARG(SvxThesaurusDialog, AlternativesSelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxThesaurusDialog, AlternativesSelectHdl_Impl, weld::ItemView&, void) { int nEntry = m_xAlternativesCT->get_selected_index(); if (nEntry != -1) diff --git a/cui/source/inc/MacroManagerDialog.hxx b/cui/source/inc/MacroManagerDialog.hxx index 8770e3f3e4d5..43eda0fa0cb8 100644 --- a/cui/source/inc/MacroManagerDialog.hxx +++ b/cui/source/inc/MacroManagerDialog.hxx @@ -72,7 +72,7 @@ public: static OUString GetDescriptionText(const OUString& rId); OUString GetSelectedScriptName(); - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } @@ -147,7 +147,7 @@ public: MacroManagerDialog* pMacroManagerDialog); ~ScriptContainersListBox(); - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } @@ -201,7 +201,7 @@ class MacroManagerDialog : public weld::GenericDialogController, public SfxListe std::unique_ptr m_xAssignButton; DECL_LINK(ClickHdl, weld::Button&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(ContextMenuHdl, const CommandEvent&, bool); DECL_LINK(CheckPasswordHdl, SvxPasswordDialog*, bool); diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index e89b4bebc543..a92122da14a3 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -31,7 +31,7 @@ class SvxMenuConfigPage : public SvxConfigPage private: bool m_bIsMenuBar; - DECL_LINK(SelectMenuEntry, weld::TreeView&, void); + DECL_LINK(SelectMenuEntry, weld::ItemView&, void); DECL_LINK(ContentContextMenuHdl, const CommandEvent&, bool); DECL_LINK(FunctionContextMenuHdl, const CommandEvent&, bool); diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index c6997a3c54d0..f44ac22b6842 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -30,7 +30,7 @@ class SvxToolbarConfigPage : public SvxConfigPage { private: - DECL_LINK(SelectToolbarEntry, weld::TreeView&, void); + DECL_LINK(SelectToolbarEntry, weld::ItemView&, void); DECL_LINK(MoveHdl, weld::Button&, void); DECL_LINK(GearHdl, const OUString&, void); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index abc29984cb3d..f6faa27a7e12 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -108,7 +108,7 @@ private: DECL_LINK(ChangeHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(SearchUpdateHdl, weld::Entry&, void); DECL_LINK(Save, weld::Button&, void); DECL_LINK(Load, weld::Button&, void); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index d075e7e365c9..3f8b5f06ba1b 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -118,7 +118,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage std::unique_ptr m_xCheckLB; std::unique_ptr m_xEditPB; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(EditHdl, weld::Button&, void); DECL_LINK(DoubleClickEditHdl, const weld::TreeIter&, bool); @@ -191,7 +191,7 @@ private: std::unique_ptr m_xDeleteReplacePB; std::unique_ptr m_xButtonBox; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); DECL_LINK(EntrySizeAllocHdl, const Size&, void); @@ -250,7 +250,7 @@ private: DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); bool NewDelHdl(const weld::Widget*); /// Box filled with new language @@ -409,7 +409,7 @@ private: Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: /// construction via Create() diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index a006e39f5e17..a68c78088979 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -440,7 +440,7 @@ protected: SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&); DECL_LINK(MoveHdl, weld::Button&, void); - DECL_LINK(SelectFunctionHdl, weld::TreeView&, void); + DECL_LINK(SelectFunctionHdl, weld::ItemView&, void); DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(SelectSaveInLocation, weld::ComboBox&, void); DECL_LINK(SelectElementHdl, weld::ComboBox&, void); @@ -549,7 +549,7 @@ class SvxMainMenuOrganizerDialog : public weld::GenericDialogController DECL_LINK(MoveHdl, weld::Button&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: SvxMainMenuOrganizerDialog( diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 2043b06f50f9..a4adbda39551 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -117,7 +117,7 @@ class CuiConfigFunctionListBox public: CuiConfigFunctionListBox(std::unique_ptr xTreeView); void set_sensitive(bool bSensitive) { m_xTreeView->set_sensitive(bSensitive); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } @@ -217,7 +217,7 @@ class CuiConfigGroupListBox public: CuiConfigGroupListBox(std::unique_ptr xTreeView); void set_sensitive(bool bSensitive) { m_xTreeView->set_sensitive(bSensitive); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } @@ -260,7 +260,7 @@ class SvxScriptSelectorDialog : public weld::GenericDialogController std::unique_ptr m_xDescriptionFrame; DECL_LINK(ClickHdl, weld::Button&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(FunctionDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(ContextMenuHdl, const CommandEvent&, bool); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ef2b99761410..4baab0edc89e 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -321,11 +321,11 @@ private: void UpdatePreview_Impl(); void Initialize(); - void SelectCharacter(weld::TreeView* pBox); + void SelectCharacter(weld::ItemView* pBox); void SetBracket(sal_Unicode cBracket, bool bStart); DECL_LINK(TwoLinesHdl_Impl, weld::Toggleable&, void); - DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void); + DECL_LINK(CharacterMapHdl_Impl, weld::ItemView&, void); public: SvxCharTwoLinesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index f648ad35cf01..992536c29418 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -253,7 +253,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK(ClickSearchHdl, weld::Button&, void); DECL_LINK(ClickTakeHdl, weld::Button&, void); DECL_LINK(ClickTakeAllHdl, weld::Button&, void); - DECL_LINK(SelectFoundHdl, weld::TreeView&, void); + DECL_LINK(SelectFoundHdl, weld::ItemView&, void); DECL_LINK(SelectFileTypeHdl, weld::ComboBox&, void); DECL_LINK(DClickFoundHdl, const weld::TreeIter&, bool); DECL_LINK(PreviewTimerHdl, Timer*, void); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index ef630fc69119..ebc6bc6ec9f2 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -43,7 +43,7 @@ private: DECL_LINK(DeleteHdl, weld::Button&, void); DECL_LINK(PathBoxDoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(PathSelect_Impl, weld::TreeView&, void); + DECL_LINK(PathSelect_Impl, weld::ItemView&, void); DECL_LINK(HeaderSelect_Impl, int, void); DECL_LINK(NameValidator, const OUString&, bool); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index ae955499a243..9586b582a680 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -63,7 +63,7 @@ namespace svx OUString GetEntry( sal_uInt16 nPos ) const; OUString GetSelectedEntry() const; - DECL_LINK( SelectSuggestionListBoxHdl, weld::TreeView&, void ); + DECL_LINK(SelectSuggestionListBoxHdl, weld::ItemView&, void); DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(bool bListBox); @@ -195,7 +195,7 @@ namespace svx std::unique_ptr m_xOkPB; DECL_LINK( OkHdl, weld::Button&, void ); - DECL_LINK( DictsLB_SelectHdl, weld::TreeView&, void ); + DECL_LINK(DictsLB_SelectHdl, weld::ItemView&, void); DECL_LINK( NewDictHdl, weld::Button&, void ); DECL_LINK( EditDictHdl, weld::Button&, void ); DECL_LINK( DeleteDictHdl, weld::Button&, void ); diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 7099a6934a73..5a01f265ff36 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(LinksSelectHdl, weld::ItemView&, void); DECL_LINK(LinksDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(UpdateNowClickHdl, weld::Button&, void); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 322da0ba48b0..b93a1dde9756 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -50,9 +50,9 @@ class SfxMacroTabPage final : public SfxTabPage Idle m_aFillGroupIdle{ "cui SfxMacroTabPage m_aFillGroupIdle" }; bool m_bGotEvents; - DECL_LINK(SelectEvent_Impl, weld::TreeView&, void); - DECL_LINK(SelectGroup_Impl, weld::TreeView&, void); - DECL_LINK(SelectMacro_Impl, weld::TreeView&, void); + DECL_LINK(SelectEvent_Impl, weld::ItemView&, void); + DECL_LINK(SelectGroup_Impl, weld::ItemView&, void); + DECL_LINK(SelectMacro_Impl, weld::ItemView&, void); DECL_LINK(MacroTreeViewActivatedHdl, const weld::TreeIter&, bool); DECL_LINK(AssignmentsTreeViewActivatedHdl, const weld::TreeIter&, bool); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 06896ee8474a..2e9f24e1e21d 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -37,7 +37,7 @@ class SvxMacroTabPage_Impl; class SvxMacroTabPage_ : public SfxTabPage { - DECL_LINK( SelectEvent_Impl, weld::TreeView&, void ); + DECL_LINK(SelectEvent_Impl, weld::ItemView&, void); DECL_LINK( AssignDeleteHdl_Impl, weld::Button&, void ); DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK( DeleteAllHdl_Impl, weld::Button&, void ); diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 4d5b0b2ddc48..7b428bf50de0 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -35,7 +35,7 @@ private: DECL_LINK(AddHdl_Impl, weld::Button&, void); DECL_LINK(DelHdl_Impl, weld::Button&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK(CheckHdl_Impl, const weld::TreeView::iter_col&, void); public: @@ -56,7 +56,7 @@ private: DECL_LINK(AddHdl_Impl, weld::Button&, void); DECL_LINK(DelHdl_Impl, weld::Button&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); public: SvxPathSelectDialog(weld::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index c0a31942e717..a51ddd1e70e7 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -138,7 +138,7 @@ private: DECL_LINK(LostFocusHdl_Impl, weld::Widget&, void); DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK(SelFormatListBoxHdl_Impl, weld::ComboBox&, void); - DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::ItemView&, void); DECL_LINK(SelFormatClickHdl_Impl, weld::Toggleable&, void); void SelFormatHdl_Impl(weld::Widget*); DECL_LINK(ClickHdl_Impl, weld::Button&, void); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 98031f7ac877..85ab4de4c779 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -283,7 +283,7 @@ class SvxNumOptionsTabPage : public SfxTabPage void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void); - DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); + DECL_LINK(LevelHdl_Impl, weld::ItemView&, void); DECL_LINK(LevelHdl, void *, void); DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void); DECL_LINK(GraphicHdl_Impl, const OUString&, void); @@ -371,7 +371,7 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); + DECL_LINK(LevelHdl_Impl, weld::ItemView&, void); DECL_LINK(LevelHdl, void *, void); DECL_LINK(EditModifyHdl_Impl, weld::ComboBox&, void); DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 58ea7418e286..56de74189d8c 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -86,7 +86,7 @@ private: DECL_LINK(SelectBookHdl_Impl, weld::ComboBox&, void); DECL_LINK(SelectLangHdl_Impl, weld::ComboBox&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(NewDelButtonHdl, weld::Button&, void); DECL_LINK(NewDelActionHdl, weld::Entry&, bool); DECL_LINK(ModifyHdl, weld::Entry&, void); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index bfbc49942968..e149a0fefe0b 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -56,7 +56,7 @@ class SvxEditModulesDlg : public weld::GenericDialogController css::uno::Reference< css::configuration::XReadWriteAccess> m_xReadWriteAccess; - DECL_LINK( SelectHdl_Impl, weld::TreeView&, void ); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK( UpDownHdl_Impl, weld::Button&, void ); DECL_LINK( ClickHdl_Impl, weld::Button&, void ); DECL_LINK( BackHdl_Impl, weld::Button&, void ); @@ -122,7 +122,7 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uInt32 GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK( SelectHdl_Impl, weld::TreeView&, void ); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK( ClickHdl_Impl, weld::Button&, void ); DECL_LINK(BoxDoubleClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK( ModulesBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 6b675b886fb3..141b2de0cf2e 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(DoubleClickPathHdl_Impl, const weld::TreeIter&, bool); DECL_LINK(StandardHdl_Impl, weld::Button&, void); - DECL_LINK(PathSelect_Impl, weld::TreeView&, void); + DECL_LINK(PathSelect_Impl, weld::ItemView&, void); DECL_LINK(HeaderBarClick, int, void); DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 638ac6430eba..2f54497b626c 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -44,7 +44,7 @@ class SvPasteObjectDialog : public weld::GenericDialogController weld::TreeView& ObjectLB() { return *m_xLbInsertList; } void SelectObject(); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); public: diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 76931fd1e93a..8bfca54446ab 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -97,7 +97,7 @@ class SvxScriptOrgDialog : public SfxDialogController std::unique_ptr m_xRenameButton; std::unique_ptr m_xDelButton; - DECL_LINK( ScriptSelectHdl, weld::TreeView&, void ); + DECL_LINK(ScriptSelectHdl, weld::ItemView&, void); DECL_LINK( ExpandingHdl, const weld::TreeIter&, bool ); DECL_LINK( ButtonHdl, weld::Button&, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet > const & xProps, OUString const & propName ); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index e0553e958b3f..a815f4f27b8c 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -59,7 +59,7 @@ public: DECL_LINK( LeftBtnHdl_Impl, weld::Button&, void ); DECL_LINK( LanguageHdl_Impl, weld::ComboBox&, void ); DECL_LINK( WordSelectHdl_Impl, weld::ComboBox&, void ); - DECL_LINK( AlternativesSelectHdl_Impl, weld::TreeView&, void ); + DECL_LINK(AlternativesSelectHdl_Impl, weld::ItemView&, void); DECL_LINK(AlternativesDoubleClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK( SelectFirstHdl_Impl, void*, void ); DECL_LINK( ReplaceEditHdl_Impl, weld::Entry&, void ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 6ff3ca0449ac..488cbcc0594a 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -189,7 +189,7 @@ private: void ApplyOptions(); - DECL_LINK(ShowPageHdl_Impl, weld::TreeView&, void); + DECL_LINK(ShowPageHdl_Impl, weld::ItemView&, void); DECL_LINK(BackHdl_Impl, weld::Button&, void); DECL_LINK(ApplyHdl_Impl, weld::Button&, void); DECL_LINK(HelpHdl_Impl, weld::Widget&, bool); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 8f0796638b76..5d134423d0d3 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -229,7 +229,7 @@ namespace offapp implInitControls(*_rSet); } - IMPL_LINK_NOARG(ConnectionPoolOptionsPage, OnDriverRowChanged, weld::TreeView&, void) + IMPL_LINK_NOARG(ConnectionPoolOptionsPage, OnDriverRowChanged, weld::ItemView&, void) { const int nDriverPos = m_xDriverList->get_selected_index(); bool bValidRow = (nDriverPos != -1); diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index dc8c4849b46e..27e21a26aaca 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -68,7 +68,7 @@ namespace offapp DECL_LINK(OnEnabledDisabled, weld::Toggleable&, void); DECL_LINK(OnSpinValueChanged, weld::SpinButton&, void); - DECL_LINK(OnDriverRowChanged, weld::TreeView&, void); + DECL_LINK(OnDriverRowChanged, weld::ItemView&, void); void implInitControls(const SfxItemSet& _rSet); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 9848bf6fa7c0..8a48dd341fe4 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -264,7 +264,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, int, nCol, void ) m_xPathBox->set_sort_indicator(bSortMode ? TRISTATE_TRUE : TRISTATE_FALSE, nCol); } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, weld::ItemView&, void) { DatabaseRegistration* pRegistration = weld::fromId(m_xPathBox->get_selected_id()); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 553100a84836..2888dfce5265 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -299,7 +299,7 @@ IMPL_LINK(SvxFontSubstTabPage, ClickHdl, weld::Button&, rButton, void) SelectHdl(&rButton); } -IMPL_LINK(SvxFontSubstTabPage, TreeListBoxSelectHdl, weld::TreeView&, rButton, void) +IMPL_LINK(SvxFontSubstTabPage, TreeListBoxSelectHdl, weld::ItemView&, rButton, void) { SelectHdl(&rButton); } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 9e8592891719..aa4c3aba7014 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -47,7 +47,7 @@ class SvxFontSubstTabPage : public SfxTabPage DECL_LINK(SelectComboBoxHdl, weld::ComboBox&, void); DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ClickHdl, weld::Button&, void); - DECL_LINK(TreeListBoxSelectHdl, weld::TreeView&, void); + DECL_LINK(TreeListBoxSelectHdl, weld::ItemView&, void); DECL_LINK(NonPropFontsHdl, weld::Toggleable&, void); DECL_LINK(HeaderBarClick, int, void); DECL_LINK(ResizeHdl, const Size&, void); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index a6e84108996a..dc0efb062bd9 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -94,7 +94,7 @@ void SvxDefaultColorOptPage::FillBoxChartColorLB() m_xLbChartColors->thaw(); } -IMPL_LINK_NOARG(SvxDefaultColorOptPage, LbChartColorsSelectionChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, LbChartColorsSelectionChangedHdl, weld::ItemView&, void) { auto nIndex = m_xLbChartColors->get_selected_index(); if (nIndex == -1) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 74c73781f90a..04adef516574 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -54,7 +54,7 @@ private: DECL_LINK(RemoveChartColor, weld::Button&, void); DECL_LINK(BoxClickedHdl, ValueSet*, void); DECL_LINK(SelectPaletteLbHdl, weld::ComboBox&, void); - DECL_LINK(LbChartColorsSelectionChangedHdl, weld::TreeView&, void); + DECL_LINK(LbChartColorsSelectionChangedHdl, weld::ItemView&, void); void FillPaletteLB(); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index cb708cc9c510..a7e00a00c9f7 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -547,24 +547,25 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) } } -IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, weld::ItemView&, rBox, void) { if (bDoNothing) return; - int nEntry = rBox.get_selected_index(); + weld::TreeView& rTreeView = dynamic_cast(rBox); + int nEntry = rTreeView.get_selected_index(); if(!bFirstSelect) { if (nEntry != -1) { - OUString sTmpShort(rBox.get_text(nEntry, 0)); + OUString sTmpShort(rTreeView.get_text(nEntry, 0)); // without this the cursor is always at the beginning of a word, if the text // is set over the ModifyHdl, although you're editing there at the moment if (m_xWordED->get_text() != sTmpShort) m_xWordED->set_text(sTmpShort); if (&rBox == m_xDoubleColumnLB.get()) - m_xReplaceED->set_text(rBox.get_text(nEntry, 1)); + m_xReplaceED->set_text(rTreeView.get_text(nEntry, 1)); } } else diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1d1edf6c3474..d93f7468f2ef 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -151,7 +151,7 @@ IMPL_LINK(SvxJavaOptionsPage, CheckHdl_Impl, const weld::TreeView::iter_col&, rR HandleCheckEntry(m_xJavaList->get_iter_index_in_parent(rRowCol.first)); } -IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::ItemView&, void) { UpdateJavaPathText(); } @@ -710,7 +710,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, EditHdl_Impl, weld::Button&, void) EditParameter(); } -IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, weld::ItemView&, void) { EnableEditButton(); EnableRemoveButton(); @@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl, weld::Button&, void) EnableRemoveButton(); } -IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl, weld::ItemView&, void) { EnableRemoveButton(); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index f5c69b61c59b..b333c6f3d04e 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -84,7 +84,7 @@ private: DECL_LINK(EnableHdl_Impl, weld::Toggleable&, void); DECL_LINK(CheckHdl_Impl, const weld::TreeView::iter_col&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK(AddHdl_Impl, weld::Button&, void); DECL_LINK(ParameterHdl_Impl, weld::Button&, void); DECL_LINK(ClassPathHdl_Impl, weld::Button&, void); @@ -130,7 +130,7 @@ private: DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); DECL_LINK(ActivateHdl_Impl, weld::Entry&, bool); DECL_LINK(AssignHdl_Impl, weld::Button&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK(DblClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK(RemoveHdl_Impl, weld::Button&, void); DECL_LINK(EditHdl_Impl, weld::Button&, void); @@ -187,7 +187,7 @@ private: DECL_LINK(AddArchiveHdl_Impl, weld::Button&, void); DECL_LINK(AddPathHdl_Impl, weld::Button&, void); DECL_LINK(RemoveHdl_Impl, weld::Button&, void); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); bool IsPathDuplicate(std::u16string_view _rPath); void EnableRemoveButton() diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 56b17dde846e..892d5bcd8e02 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1497,7 +1497,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) } } -IMPL_LINK(SvxLinguTabPage, SelectHdl_Impl, weld::TreeView&, rBox, void) +IMPL_LINK(SvxLinguTabPage, SelectHdl_Impl, weld::ItemView&, rBox, void) { if (m_xLinguModulesCLB.get() == &rBox) { @@ -1612,7 +1612,7 @@ SvxEditModulesDlg::~SvxEditModulesDlg() delete weld::fromId(m_xModulesCLB->get_id(i)); } -IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, weld::TreeView&, rBox, void ) +IMPL_LINK(SvxEditModulesDlg, SelectHdl_Impl, weld::ItemView&, rBox, void) { int nCurPos = rBox.get_selected_index(); if (nCurPos == -1) diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 4eded88442ec..f26b59b4b3ec 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -342,7 +342,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) PathSelect_Impl(*m_xPathBox); } -IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, weld::ItemView&, void) { bool bEnable = false; int nEntry = m_xPathBox->get_selected_index(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index a5c4ef7493ac..d0c8119c1e2b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -611,7 +611,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName, return nRet - 1; } -IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl, weld::ItemView&, void) { SelectHdl_Impl(); } diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index facbf27673d4..89803e5d8767 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl, weld::Button&, void) m_xDeleteBtn->set_sensitive(false); } -IMPL_LINK_NOARG(TSAURLsDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(TSAURLsDialog, SelectHdl, weld::ItemView&, void) { m_xDeleteBtn->set_sensitive(true); } diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 688497371c98..437d991d87d2 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -29,7 +29,7 @@ private: DECL_LINK(OKHdl_Impl, weld::Button&, void); // After operations in a TreeView we have nothing selected // Is Selected element handler for the TreeView - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); std::set m_aURLs; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 29865c891ccc..c7d6253f9beb 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -206,8 +206,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl, weld::Button&, void) {} } - -IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl, weld::ItemView&, void) { int nEntry = m_xPasswordsLB->get_selected_index(); if (nEntry == -1) diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 476df534dff0..b1c8712e08cc 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -37,7 +37,7 @@ namespace svx DECL_LINK( RemovePasswordHdl, weld::Button&, void ); DECL_LINK( RemoveAllPasswordsHdl, weld::Button&, void ); DECL_LINK( ChangePasswordHdl, weld::Button&, void ); - DECL_LINK( EntrySelectedHdl, weld::TreeView&, void ); + DECL_LINK(EntrySelectedHdl, weld::ItemView&, void); void FillPasswordList(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 1efa5d45e580..32f0b189e4b5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -663,7 +663,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) m_xCheckLB->thaw(); } -IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, weld::ItemView&, rBox, void) { m_xEditPB->set_sensitive(rBox.get_selected_id().toInt64() != 0); } @@ -958,7 +958,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) } } -IMPL_LINK_NOARG(OfaAutocorrReplacePage, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OfaAutocorrReplacePage, SelectHdl, weld::ItemView&, void) { if(!bFirstSelect || !bHasSelectionText) { @@ -1539,7 +1539,7 @@ bool OfaAutocorrExceptPage::NewDelHdl(const weld::Widget* pBtn) return true; } -IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, weld::ItemView&, rBox, void) { if (&rBox == m_xAbbrevLB.get()) { @@ -2324,7 +2324,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, weld::Toggleable&, void) /** Handler for the list box */ -IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, weld::ItemView&, void) { const int nPos = m_xSmartTagTypesLB->get_selected_index(); if (nPos == -1) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 5bcb019b58bf..fbbb21ea9514 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3158,7 +3158,7 @@ void SvxCharTwoLinesPage::Initialize() m_xTwoLinesBtn->connect_toggled(LINK(this, SvxCharTwoLinesPage, TwoLinesHdl_Impl)); - Link aLink = LINK(this, SvxCharTwoLinesPage, CharacterMapHdl_Impl); + Link aLink = LINK(this, SvxCharTwoLinesPage, CharacterMapHdl_Impl); m_xStartBracketLB->connect_selection_changed(aLink); m_xEndBracketLB->connect_selection_changed(aLink); @@ -3170,7 +3170,7 @@ void SvxCharTwoLinesPage::Initialize() rCTLFont.SetFontSize( Size( 0, 220 ) ); } -void SvxCharTwoLinesPage::SelectCharacter(weld::TreeView* pBox) +void SvxCharTwoLinesPage::SelectCharacter(weld::ItemView* pBox) { bool bStart = pBox == m_xStartBracketLB.get(); SvxCharacterMap aDlg(GetFrameWeld(), nullptr, nullptr); @@ -3232,7 +3232,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, weld::Toggleable&, void) UpdatePreview_Impl(); } -IMPL_LINK(SvxCharTwoLinesPage, CharacterMapHdl_Impl, weld::TreeView&, rBox, void) +IMPL_LINK(SvxCharTwoLinesPage, CharacterMapHdl_Impl, weld::ItemView&, rBox, void) { int nPos = rBox.get_selected_index(); if (rBox.get_id(nPos).toInt32() == CHRDLG_ENCLOSE_SPECIAL_CHAR) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index f85f63db7017..f426407f629b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -222,7 +222,7 @@ bool SfxMacroTabPage::IsReadOnly() const return false; } -IMPL_LINK_NOARG(SfxMacroTabPage, SelectEvent_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxMacroTabPage, SelectEvent_Impl, weld::ItemView&, void) { weld::TreeView& rListBox = m_xEventLB->GetListBox(); int nSelected = rListBox.get_selected_index(); @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(SfxMacroTabPage, SelectEvent_Impl, weld::TreeView&, void) EnableButtons(); } -IMPL_LINK_NOARG(SfxMacroTabPage, SelectGroup_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxMacroTabPage, SelectGroup_Impl, weld::ItemView&, void) { m_xGroupLB->GroupSelected(); const OUString sScriptURI = m_xMacroLB->GetSelectedScriptURI(); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG(SfxMacroTabPage, SelectGroup_Impl, weld::TreeView&, void) EnableButtons(); } -IMPL_LINK_NOARG(SfxMacroTabPage, SelectMacro_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxMacroTabPage, SelectMacro_Impl, weld::ItemView&, void) { EnableButtons(); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9e479e2a6d72..9682dc66a6c9 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -268,7 +268,8 @@ void SvxNumberFormatTabPage::Init_Impl() m_xCbSourceFormat->set_sensitive(false); m_xCbSourceFormat->hide(); - Link aLink2 = LINK(this, SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl); + Link aLink2 + = LINK(this, SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl); Link aLink3 = LINK(this, SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl); m_xLbCategory->connect_selection_changed(aLink2); m_xLbCategory->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl)); @@ -1115,7 +1116,7 @@ IMPL_LINK(SvxNumberFormatTabPage, SelFormatClickHdl_Impl, weld::Toggleable&, rLb SelFormatHdl_Impl(&rLb); } -IMPL_LINK(SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, weld::TreeView&, rLb, void) +IMPL_LINK(SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, weld::ItemView&, rLb, void) { SelFormatHdl_Impl(&rLb); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 06d1fb647829..3f8becb9e2b5 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1712,7 +1712,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( NumberType nType ) m_xOrientLB->set_sensitive(bEnableBitmap); } -IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, LevelHdl_Impl, weld::ItemView&, void) { if (m_pLevelHdlEvent) return; @@ -2818,7 +2818,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, weld::ComboBox&, void SetModified(); } -IMPL_LINK_NOARG(SvxNumPositionTabPage, LevelHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, LevelHdl_Impl, weld::ItemView&, void) { if (m_pLevelHdlEvent) return; diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index fe1d606ba04c..ff48b3d1704c 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -100,7 +100,7 @@ IMPL_LINK_NOARG(OTasksWindow, FocusOutHdl, weld::Widget&, void) m_xTreeView->unselect_all(); } -IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, weld::ItemView&, void) { m_nCursorIndex = m_xTreeView->get_cursor_index(); updateHelpText(); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 6d42d796436f..90bfe4720f5f 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -71,7 +71,7 @@ namespace dbaui int m_nCursorIndex; DECL_LINK(onSelected, const weld::TreeIter&, bool); - DECL_LINK(OnEntrySelectHdl, weld::TreeView&, void); + DECL_LINK(OnEntrySelectHdl, weld::ItemView&, void); DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(FocusOutHdl, weld::Widget&, void); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 6b24eaccf99c..88ee9635edcb 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -176,7 +176,7 @@ void TreeListBox::implStartSelectionTimer() m_aTimer.Start(); } -IMPL_LINK_NOARG(TreeListBox, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(TreeListBox, SelectHdl, weld::ItemView&, void) { implStartSelectionTimer(); } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index dcf90d1ddc56..3d423feb34b8 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -419,7 +419,7 @@ void OAddTableDlg::Add() } } -IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG(OAddTableDlg, TableListSelectHdl, weld::ItemView&, void) { m_xAddButton->set_sensitive( m_xCurrentList->isLeafSelected() ); } diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 82d39d893b52..6a5df9ba47cc 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -199,7 +199,7 @@ IMPL_LINK_NOARG(ODbaseIndexDialog, RemoveAllClickHdl, weld::Button&, void) checkButtons(); } -IMPL_LINK_NOARG(ODbaseIndexDialog, OnListEntrySelected, weld::TreeView&, void) +IMPL_LINK_NOARG(ODbaseIndexDialog, OnListEntrySelected, weld::ItemView&, void) { checkButtons(); } diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 6bb6a5c335e5..1d64ff560d38 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -87,7 +87,7 @@ class ODbaseIndexDialog : public weld::GenericDialogController DECL_LINK( AddAllClickHdl, weld::Button&, void ); DECL_LINK( RemoveAllClickHdl, weld::Button&, void ); DECL_LINK( OKClickHdl, weld::Button&, void ); - DECL_LINK( OnListEntrySelected, weld::TreeView&, void ); + DECL_LINK(OnListEntrySelected, weld::ItemView&, void); protected: void Init(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 535caed5cfb0..3609ea297b5f 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -732,7 +732,7 @@ void DbaIndexDialog::IndexSelected() updateToolbox(); } -IMPL_LINK_NOARG(DbaIndexDialog, OnIndexSelected, weld::TreeView&, void) +IMPL_LINK_NOARG(DbaIndexDialog, OnIndexSelected, weld::ItemView&, void) { if (m_bNoHandlerCall) return; diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 2aabd218025d..a32ea7b5055a 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -255,7 +255,7 @@ namespace dbaui } } - IMPL_LINK_NOARG(OParameterDialog, OnEntryListBoxSelected, weld::TreeView&, void) + IMPL_LINK_NOARG(OParameterDialog, OnEntryListBoxSelected, weld::ItemView&, void) { OnEntrySelected(); } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 361d8dc8dbfc..74225fcd9a5e 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -233,7 +233,7 @@ public: OExceptionChainDialog(weld::Window* pParent, ExceptionDisplayChain&& rExceptions); protected: - DECL_LINK(OnExceptionSelected, weld::TreeView&, void); + DECL_LINK(OnExceptionSelected, weld::ItemView&, void); private: void insertExceptionEntry(size_t nElementPos, const ExceptionDisplayInfo& rEntry); @@ -297,7 +297,7 @@ void OExceptionChainDialog::insertExceptionEntry(size_t nElementPos, lcl_getImageName(rEntry.eType)); } -IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected, weld::TreeView&, void) +IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected, weld::ItemView&, void) { OUString sText; diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index d108c043c635..e9d419188977 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -44,8 +44,8 @@ namespace dbaui DECL_LINK( ButtonClickHdl, weld::Button&, void ); DECL_LINK( RightButtonClickHdl, weld::Button&, void ); DECL_LINK( AllNoneClickHdl, weld::Button&, void ); - DECL_LINK( TableListClickHdl, weld::TreeView&, void ); - DECL_LINK( TableListRightSelectHdl, weld::TreeView&, void ); + DECL_LINK(TableListClickHdl, weld::ItemView&, void); + DECL_LINK(TableListRightSelectHdl, weld::ItemView&, void); static void FillListBox(weld::TreeView& rTreeView, const ODatabaseExport::TColumnVector& rList, bool bCheckButtons); diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index e503ddf46428..290414481831 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -67,7 +67,7 @@ namespace dbaui DECL_LINK(CommandHdl, const CommandEvent&, bool); - Link m_aChangeHdl; + Link m_aChangeHdl; public: OWizTypeSelectList(std::unique_ptr xControl); @@ -86,7 +86,7 @@ namespace dbaui void set_selection_mode(SelectionMode eMode) { m_xControl->set_selection_mode(eMode); } int count_selected_rows() const { return m_xControl->count_selected_rows(); } void select(int pos) { m_xControl->select(pos); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_aChangeHdl = rLink; m_xControl->connect_selection_changed(rLink); @@ -101,7 +101,7 @@ namespace dbaui friend class OWizTypeSelectControl; friend class OWizTypeSelectList; - DECL_LINK( ColumnSelectHdl, weld::TreeView&, void ); + DECL_LINK(ColumnSelectHdl, weld::ItemView&, void); DECL_LINK( ButtonClickHdl, weld::Button&, void ); protected: std::unique_ptr m_xColumnNames; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 075a04709aba..8b2472d32def 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -71,7 +71,7 @@ namespace dbaui DECL_LINK( AddClickHdl, weld::Button&, void ); DECL_LINK( CloseClickHdl, weld::Button&, void); DECL_LINK(TableListDoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK( TableListSelectHdl, weld::TreeView&, void ); + DECL_LINK(TableListSelectHdl, weld::ItemView&, void); DECL_LINK( OnTypeSelected, weld::Toggleable&, void ); public: diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index a1e681c9c87e..03e193ed22df 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -65,7 +65,7 @@ namespace dbaui IContextMenuProvider* m_pContextMenuProvider; DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString); DECL_LINK(CommandHdl, const CommandEvent&, bool); DECL_LINK(DragBeginHdl, bool&, bool); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index da6a9d713f68..01fc1c67c67f 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -75,7 +75,7 @@ private: void IndexSelected(); - DECL_LINK(OnIndexSelected, weld::TreeView&, void); + DECL_LINK(OnIndexSelected, weld::ItemView&, void); DECL_LINK(OnIndexAction, const OUString&, void); DECL_LINK(OnEntryEditing, const weld::TreeIter&, bool); DECL_LINK(OnEntryEdited, const IterString&, bool); diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index d97f523d7fc6..b39b213cf493 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -89,7 +89,7 @@ namespace dbaui DECL_LINK(OnVisitedTimeout, Timer*, void); DECL_LINK(OnValueModified, weld::Entry&, void); - DECL_LINK(OnEntryListBoxSelected, weld::TreeView&, void); + DECL_LINK(OnEntryListBoxSelected, weld::ItemView&, void); DECL_LINK(OnButtonClicked, weld::Button&, void); DECL_LINK(OnValueLoseFocusHdl, weld::Widget&, void); bool CheckValueForError(); diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 5eba2844b625..bbd327ea45b1 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -236,7 +236,7 @@ namespace } } -IMPL_LINK_NOARG(OWizNameMatching, TableListClickHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OWizNameMatching, TableListClickHdl, weld::ItemView&, void) { int nPos = m_xCTRL_LEFT->get_selected_index(); if (nPos == -1) @@ -262,7 +262,7 @@ IMPL_LINK_NOARG(OWizNameMatching, TableListClickHdl, weld::TreeView&, void) } } -IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG(OWizNameMatching, TableListRightSelectHdl, weld::ItemView&, void) { int nPos = m_xCTRL_RIGHT->get_selected_index(); if (nPos == -1) diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 7424a57fb360..5482ea13b9c3 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -245,7 +245,7 @@ OUString OWizTypeSelect::GetTitle() const return DBA_RES(STR_WIZ_TYPE_SELECT_TITLE); } -IMPL_LINK_NOARG(OWizTypeSelect, ColumnSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(OWizTypeSelect, ColumnSelectHdl, weld::ItemView&, void) { OFieldDescription* pField = weld::fromId(m_xColumnNames->get_selected_id()); if (pField) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index fec95a80cd60..b9837335254a 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -817,8 +817,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) return bIsIgnored; } - -IMPL_LINK_NOARG(UpdateDialog, selectionHandler, weld::TreeView&, void) +IMPL_LINK_NOARG(UpdateDialog, selectionHandler, weld::ItemView&, void) { OUStringBuffer b; int nSelectedPos = m_xUpdates->get_selected_index(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 450ff943b18b..f024e671e319 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -117,7 +117,7 @@ private: css::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const OUString& rDescription); - DECL_LINK(selectionHandler, weld::TreeView&, void); + DECL_LINK(selectionHandler, weld::ItemView&, void); DECL_LINK(allHandler, weld::Toggleable&, void); DECL_LINK(okHandler, weld::Button&, void); DECL_LINK(closeHandler, weld::Button&, void); diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 9fcc1d3e8471..100530e9ebb3 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -75,7 +75,7 @@ namespace abp return true; } - IMPL_LINK_NOARG( TableSelectionPage, OnTableSelected, weld::TreeView&, void ) + IMPL_LINK_NOARG(TableSelectionPage, OnTableSelected, weld::ItemView&, void) { updateDialogTravelUI(); } diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 02d7898bad0b..a7513a4301ef 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -43,7 +43,7 @@ namespace abp // OImportPage overridables virtual bool canAdvance() const override; - DECL_LINK(OnTableSelected, weld::TreeView&, void); + DECL_LINK(OnTableSelected, weld::ItemView&, void); DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool); }; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 871fa468a991..f3b0a18fa856 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -213,7 +213,7 @@ IMPL_LINK_NOARG(OTableSelectionPage, OnListboxDoubleClicked, const weld::TreeIte return true; } -IMPL_LINK(OTableSelectionPage, OnListboxSelection, weld::TreeView&, _rBox, void) +IMPL_LINK(OTableSelectionPage, OnListboxSelection, weld::ItemView&, _rBox, void) { if (m_xDatasource.get() == &_rBox) { // new data source selected diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 90a425caa462..1bf98755b251 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -48,7 +48,7 @@ private: virtual void initializePage() override; virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override; - DECL_LINK(OnListboxSelection, weld::TreeView&, void); + DECL_LINK(OnListboxSelection, weld::ItemView&, void); DECL_LINK(OnListboxDoubleClicked, const weld::TreeIter&, bool); DECL_LINK(OnSearchClicked, weld::Button&, void); diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 91eaa53569e9..cd02b44cb62d 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -371,7 +371,7 @@ namespace dbp return true; } - IMPL_LINK_NOARG(OGridFieldsSelection, OnEntrySelected, weld::TreeView&, void) + IMPL_LINK_NOARG(OGridFieldsSelection, OnEntrySelected, weld::ItemView&, void) { implCheckButtons(); } diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 54e7cbe2e290..c664383b7361 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -92,7 +92,7 @@ namespace dbp DECL_LINK(OnMoveOneEntry, weld::Button&, void); DECL_LINK(OnMoveAllEntries, weld::Button&, void); - DECL_LINK(OnEntrySelected, weld::TreeView&, void); + DECL_LINK(OnEntrySelected, weld::ItemView&, void); DECL_LINK(OnEntryDoubleClicked, const weld::TreeIter&, bool); void implCheckButtons(); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 983ccfcd7556..bd28e08c50c9 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -258,7 +258,7 @@ namespace dbp m_xRadioName->grab_focus(); } - IMPL_LINK_NOARG( ORadioSelectionPage, OnEntrySelected, weld::TreeView&, void ) + IMPL_LINK_NOARG(ORadioSelectionPage, OnEntrySelected, weld::ItemView&, void) { implCheckMoveButtons(); } @@ -351,7 +351,7 @@ namespace dbp { } - IMPL_LINK_NOARG( OOptionValuesPage, OnOptionSelected, weld::TreeView&, void ) + IMPL_LINK_NOARG(OOptionValuesPage, OnOptionSelected, weld::ItemView&, void) { implTraveledOptions(); } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index ac52f34d3063..a68ec578bc29 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -97,7 +97,7 @@ namespace dbp virtual bool canAdvance() const override; DECL_LINK( OnMoveEntry, weld::Button&, void ); - DECL_LINK( OnEntrySelected, weld::TreeView&, void ); + DECL_LINK(OnEntrySelected, weld::ItemView&, void); DECL_LINK( OnNameModified, weld::Entry&, void ); void implCheckMoveButtons(); @@ -144,7 +144,7 @@ namespace dbp void implTraveledOptions(); - DECL_LINK( OnOptionSelected, weld::TreeView&, void ); + DECL_LINK(OnOptionSelected, weld::ItemView&, void); }; class OOptionDBFieldPage : public ODBFieldPage diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 6af1549b9b11..dcf37fba2d01 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -293,7 +293,7 @@ bool OContentTableSelection::canAdvance() const return 0 != m_xSelectTable->count_selected_rows(); } -IMPL_LINK_NOARG(OContentTableSelection, OnTableSelected, weld::TreeView&, void) +IMPL_LINK_NOARG(OContentTableSelection, OnTableSelected, weld::ItemView&, void) { updateDialogTravelUI(); } @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(OContentFieldSelection, OnTableDoubleClicked, const weld::TreeIt return true; } -IMPL_LINK_NOARG(OContentFieldSelection, OnFieldSelected, weld::TreeView&, void) +IMPL_LINK_NOARG(OContentFieldSelection, OnFieldSelected, weld::ItemView&, void) { updateDialogTravelUI(); m_xDisplayedField->set_text(m_xSelectTableField->get_selected_text()); diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index cc9a65bb958f..6ae3d320ec25 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -115,7 +115,7 @@ private: virtual bool canAdvance() const override; DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool); - DECL_LINK(OnTableSelected, weld::TreeView&, void); + DECL_LINK(OnTableSelected, weld::ItemView&, void); }; class OContentFieldSelection final : public OLCPage @@ -129,7 +129,7 @@ public: virtual ~OContentFieldSelection() override; private: - DECL_LINK(OnFieldSelected, weld::TreeView&, void); + DECL_LINK(OnFieldSelected, weld::ItemView&, void); DECL_LINK(OnTableDoubleClicked, const weld::TreeIter&, bool); // OWizardPage overridables diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index c4ae151e65ed..13a697ad737e 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -235,7 +235,7 @@ sal_Int32 OSelectLabelDialog::InsertEntries(const Reference& _xConta return nChildren; } -IMPL_LINK(OSelectLabelDialog, OnEntrySelected, weld::TreeView&, rLB, void) +IMPL_LINK(OSelectLabelDialog, OnEntrySelected, weld::ItemView&, rLB, void) { DBG_ASSERT(&rLB == m_xControlTree.get(), "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 6a61fb9d0171..36a30753c556 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -62,7 +62,7 @@ private: sal_Int32 InsertEntries(const css::uno::Reference& _xContainer, const weld::TreeIter& rContainerEntry); - DECL_LINK(OnEntrySelected, weld::TreeView&, void); + DECL_LINK(OnEntrySelected, weld::ItemView&, void); DECL_LINK(OnNoAssignmentClicked, weld::Toggleable&, void); }; } // namespace pcr diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 563a84ab98a3..a8065b891424 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -687,7 +687,7 @@ IMPL_LINK( SaneDlg, SelectHdl, weld::ComboBox&, rListBox, void ) } } -IMPL_LINK_NOARG(SaneDlg, OptionsBoxSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SaneDlg, OptionsBoxSelectHdl, weld::ItemView&, void) { if (!Sane::IsSane()) return; diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index e72f0fdb94db..d81da0d90cc9 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -87,7 +87,7 @@ private: DECL_LINK( MetricValueModifyHdl, weld::MetricSpinButton&, void ); DECL_LINK( ValueModifyHdl, weld::ComboBox&, void ); DECL_LINK( ReloadSaneOptionsHdl, Sane&, void ); - DECL_LINK( OptionsBoxSelectHdl, weld::TreeView&, void ); + DECL_LINK(OptionsBoxSelectHdl, weld::ItemView&, void); void SaveState(); bool LoadState(); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 936cb978a731..400aa505dc6c 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1788,7 +1788,7 @@ ImplErrorDialog::ImplErrorDialog(weld::Window* pParent, const std::setconnect_selection_changed(LINK(this, ImplErrorDialog, SelectHdl)); } -IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, weld::ItemView&, void) { OUString aExplanation = m_xErrors->get_selected_id(); m_xExplanation->set_label(aExplanation); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 04a654cf57bf..f29a8fa63ffa 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -49,7 +49,7 @@ private: std::unique_ptr m_xErrors; std::unique_ptr m_xExplanation; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: explicit ImplErrorDialog(weld::Window* pParent, const std::set& rErrorCodes); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index bd9c0f545143..eb89c94b4925 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -152,7 +152,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, weld::Button&, rButton, void) m_xDialog->response(RET_CLOSE); } -IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, weld::ItemView&, void) { updateStates(); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 9f58dbd4919c..06ecb5b789eb 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -37,7 +37,7 @@ public: virtual ~XMLFilterSettingsDialog() override; DECL_LINK(ClickHdl_Impl, weld::Button&, void ); - DECL_LINK(SelectionChangedHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectionChangedHdl_Impl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl_Impl, const weld::TreeIter&, bool); void UpdateWindow(); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 007e0d519758..99ece328c631 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -292,7 +292,7 @@ IMPL_LINK_NOARG(FuncPage, SelComboBoxHdl, weld::ComboBox&, void) UpdateFunctionList(searchStr); } -IMPL_LINK_NOARG(FuncPage, SelTreeViewHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(FuncPage, SelTreeViewHdl, weld::ItemView&, void) { const IFunctionDescription* pDesc = GetFuncDesc(); if (pDesc) diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index dc4970b1902f..8991bd16a040 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -69,7 +69,7 @@ private: weld::TreeIter* FillCategoriesMap(const OUString&, bool); DECL_LINK(SelComboBoxHdl, weld::ComboBox&, void); - DECL_LINK(SelTreeViewHdl, weld::TreeView&, void); + DECL_LINK(SelTreeViewHdl, weld::ItemView&, void); DECL_LINK(DblClkHdl, const weld::TreeIter&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(ModifyHdl, weld::Entry&, void); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 13668f03fe7f..94ee07e513cb 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -124,7 +124,7 @@ const FormulaToken* StructPage::GetFunctionEntry(const weld::TreeIter* pEntry) return nullptr; } -IMPL_LINK(StructPage, SelectHdl, weld::TreeView&, rTlb, void) +IMPL_LINK(StructPage, SelectHdl, weld::ItemView&, rTlb, void) { if (!GetActiveFlag()) return; diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 97cbb4b41795..104dfd8594ad 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -45,7 +45,7 @@ private: const FormulaToken* pSelectedToken; bool bActiveFlag; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); const FormulaToken* GetFunctionEntry(const weld::TreeIter* pEntry); diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index ea18e47b0579..056c1e6d7bda 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -98,7 +98,7 @@ OUString PlacesListBox::getEntryIcon( const PlacePtr& pPlace ) return theImage; } -IMPL_LINK_NOARG( PlacesListBox, Selection, weld::TreeView&, void ) +IMPL_LINK_NOARG(PlacesListBox, Selection, weld::ItemView&, void) { int nSelected = mxImpl->get_cursor_index(); assert(nSelected != -1 && "no selection"); diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index a78bd28b23fa..c415a5293215 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -57,7 +57,7 @@ private: static OUString getEntryIcon(const PlacePtr& pPlace); - DECL_LINK( Selection, weld::TreeView&, void ); + DECL_LINK(Selection, weld::ItemView&, void); DECL_LINK(DoubleClick, const weld::TreeIter&, bool); DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString); }; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 06736e13c98f..00fe2ff36f01 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -776,7 +776,7 @@ IMPL_LINK_NOARG( RemoteFilesDialog, SelectFilterHdl, weld::ComboBox&, void ) } } -IMPL_LINK(RemoteFilesDialog, TreeSelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(RemoteFilesDialog, TreeSelectHdl, weld::ItemView&, rBox, void) { OpenURL(rBox.get_selected_id()); m_xFileView->grab_focus(); @@ -1052,7 +1052,7 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL ) m_xPath->SetURL( rURL ); - m_xTreeView->connect_changed(Link()); + m_xTreeView->connect_changed(Link()); // read cached data for this url and fill the tree const ::std::vector< SvtContentEntry > aContentFolders = m_xFileView->GetContent(); diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index e61de4f73b15..5267e0ad7d2e 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -168,7 +168,7 @@ private: DECL_LINK( SelectFilterHdl, weld::ComboBox&, void ); - DECL_LINK( TreeSelectHdl, weld::TreeView&, void ); + DECL_LINK(TreeSelectHdl, weld::ItemView&, void); DECL_LINK( SelectBreadcrumbHdl, Breadcrumb*, bool ); diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 58290b2a0142..496fbb8d3f31 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -181,7 +181,7 @@ public: { mxTreeView->connect_item_activated(rLink); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { mxTreeView->connect_selection_changed(rLink); } @@ -363,7 +363,7 @@ public: } protected: - DECL_LINK(ChangedHdl, weld::TreeView&, void); + DECL_LINK(ChangedHdl, weld::ItemView&, void); DECL_LINK(SelectionChangedHdl, weld::IconView&, void); DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); DECL_LINK(ItemActivatedHdl, const weld::TreeIter&, bool); @@ -1317,7 +1317,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( std::u16string_view rFilter ) }); } -IMPL_LINK_NOARG(SvtFileView_Impl, ChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvtFileView_Impl, ChangedHdl, weld::ItemView&, void) { if (!mnSuspendSelectCallback) m_aSelectHandler.Call(m_pAntiImpl); diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx index fe9f62cc7f4b..8f0833de45a7 100644 --- a/fpicker/source/office/foldertree.hxx +++ b/fpicker/source/office/foldertree.hxx @@ -39,7 +39,7 @@ public: void clear() { m_xTreeView->clear(); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx index d7ac02c49cc2..11f48faf9fc2 100644 --- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx +++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx @@ -32,10 +32,8 @@ class XInterface; namespace weld { +class ItemView; class TreeIter; -} -namespace weld -{ class TreeView; } @@ -94,7 +92,7 @@ public: DECL_LINK(ExpandingHandlerMethods, const weld::TreeIter&, bool); // callback when the tree view selection changed to a different node - DECL_LINK(SelectionChanged, weld::TreeView&, void); + DECL_LINK(SelectionChanged, weld::ItemView&, void); // callback when a pop-up is triggered on a tree view node DECL_LINK(PopupMenuHandler, const CommandEvent&, bool); diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 820f7d8fc934..130199666e30 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -32,6 +32,7 @@ namespace weld { class Button; } namespace weld { class CheckButton; } namespace weld { class CustomWeld; } namespace weld { class Expander; } +namespace weld { class ItemView; } namespace weld { class Label; } namespace weld { class TreeIter; } namespace weld { class TreeView; } @@ -83,8 +84,8 @@ private: DECL_DLLPRIVATE_LINK( Update, Timer *, void ); - DECL_DLLPRIVATE_LINK(RegionSelect, weld::TreeView&, void); - DECL_DLLPRIVATE_LINK(TemplateSelect, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(RegionSelect, weld::ItemView&, void); + DECL_DLLPRIVATE_LINK(TemplateSelect, weld::ItemView&, void); DECL_DLLPRIVATE_LINK(DoubleClick, const weld::TreeIter&, bool); DECL_DLLPRIVATE_LINK(Expand, weld::Expander&, void); sal_uInt16 GetSelectedTemplatePos() const; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 57fd56371c05..fe03b9d1a584 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -164,7 +164,7 @@ private: public: DECL_LINK(NewCategoryEditHdl, weld::Entry&, void); - DECL_LINK(SelectCategoryHdl, weld::TreeView&, void); + DECL_LINK(SelectCategoryHdl, weld::ItemView&, void); void SetCategoryLBEntries(std::vector names); diff --git a/include/sfx2/templatedlglocalview.hxx b/include/sfx2/templatedlglocalview.hxx index 2d8ef1599615..fe6ddc84f0eb 100644 --- a/include/sfx2/templatedlglocalview.hxx +++ b/include/sfx2/templatedlglocalview.hxx @@ -65,7 +65,7 @@ private: DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); - DECL_LINK(ListViewChangedHdl, weld::TreeView&, void); + DECL_LINK(ListViewChangedHdl, weld::ItemView&, void); DECL_LINK(PopupMenuHdl, const CommandEvent&, bool); diff --git a/include/svtools/dlgname.hxx b/include/svtools/dlgname.hxx index 44c3ec791520..2de6266bebb6 100644 --- a/include/svtools/dlgname.hxx +++ b/include/svtools/dlgname.hxx @@ -178,7 +178,7 @@ private: std::unique_ptr m_xRemoveBtn; std::unique_ptr m_xEditBtn; - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK(DblClickHdl_Impl, const weld::TreeIter&, bool); DECL_LINK(AddHdl_Impl, weld::Button&, void); DECL_LINK(RemoveHdl_Impl, weld::Button&, void); diff --git a/include/svx/dialog/TableAutoFmtDlg.hxx b/include/svx/dialog/TableAutoFmtDlg.hxx index 0fe058aa5e27..7ff81467c1ca 100644 --- a/include/svx/dialog/TableAutoFmtDlg.hxx +++ b/include/svx/dialog/TableAutoFmtDlg.hxx @@ -63,7 +63,7 @@ private: DECL_LINK(EditHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); DECL_LINK(RenameHdl, weld::Button&, void); - DECL_LINK(SelFormatHdl, weld::TreeView&, void); + DECL_LINK(SelFormatHdl, weld::ItemView&, void); OUString GenerateUniqueStyleName(); diff --git a/include/vcl/weld/EntryTreeView.hxx b/include/vcl/weld/EntryTreeView.hxx index 8b3fec79f760..e7d3a948591a 100644 --- a/include/vcl/weld/EntryTreeView.hxx +++ b/include/vcl/weld/EntryTreeView.hxx @@ -23,7 +23,7 @@ namespace weld class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBox { private: - DECL_DLLPRIVATE_LINK(ClickHdl, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(ClickHdl, weld::ItemView&, void); DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); protected: diff --git a/include/vcl/weld/TreeView.hxx b/include/vcl/weld/TreeView.hxx index 821ab3efbb12..1006262af839 100644 --- a/include/vcl/weld/TreeView.hxx +++ b/include/vcl/weld/TreeView.hxx @@ -41,7 +41,7 @@ public: render_args; private: - Link m_aSelectionChangedHdl; + Link m_aSelectionChangedHdl; Link m_aColumnClickedHdl; Link m_aRadioToggleHdl; Link m_aEditingStartedHdl; @@ -192,7 +192,7 @@ public: void append_separator(const OUString& rId) { insert_separator(-1, rId); } - void connect_selection_changed(const Link& rLink) + void connect_selection_changed(const Link& rLink) { m_aSelectionChangedHdl = rLink; } diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 97b43de59ddb..3e8194dc1200 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -309,7 +309,7 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve { } -IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG(OAddFieldWindow, OnSelectHdl, weld::ItemView&, void) { m_xActions->set_item_sensitive(u"insert"_ustr, m_xListBox->get_selected_index() != -1); } diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 933de583df9f..216a0deea5dd 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -158,7 +158,7 @@ public: NavigatorTree(std::unique_ptr, OReportController& rController); virtual ~NavigatorTree() override; - DECL_LINK(OnEntrySelDesel, weld::TreeView&, void); + DECL_LINK(OnEntrySelDesel, weld::ItemView&, void); DECL_LINK(CommandHdl, const CommandEvent&, bool); virtual void _selectionChanged( const lang::EventObject& aEvent ) override; @@ -326,7 +326,7 @@ IMPL_LINK(NavigatorTree, CommandHdl, const CommandEvent&, rEvt, bool) return bHandled; } -IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, weld::TreeView&, void) +IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, weld::ItemView&, void) { if ( !m_pSelectionListener->locked() ) { diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index dcd8cc24444f..ea52f56a96aa 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -66,7 +66,7 @@ class OAddFieldWindow : public weld::GenericDialogController std::vector> m_aListBoxData; DECL_LINK(OnDoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK( OnSelectHdl, weld::TreeView&, void ); + DECL_LINK(OnSelectHdl, weld::ItemView&, void); DECL_LINK( DragBeginHdl, bool&, bool ); DECL_LINK( OnSortAction, const OUString&, void ); DECL_LINK( FocusChangeHdl, weld::Container&, void ); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index dd68345c56f4..743676490c94 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -107,7 +107,7 @@ IMPL_LINK(ScCheckListMenuControl, MenuKeyInputHdl, const KeyEvent&, rKEvt, bool) return false; } -IMPL_LINK_NOARG(ScCheckListMenuControl, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScCheckListMenuControl, SelectHdl, weld::ItemView&, void) { sal_uInt32 nSelectedMenu = MENU_NOT_SELECTED; std::unique_ptr pSelected = mxMenu->get_selected(); @@ -2042,7 +2042,7 @@ IMPL_LINK(ScListSubMenuControl, MenuKeyInputHdl, const KeyEvent&, rKEvt, bool) return bConsumed; } -IMPL_LINK(ScListSubMenuControl, ColorSelChangedHdl, weld::TreeView&, rMenu, void) +IMPL_LINK(ScListSubMenuControl, ColorSelChangedHdl, weld::ItemView&, rMenu, void) { if (rMenu.get_selected_index() == -1) return; diff --git a/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx b/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx index 2c1aea2120de..5f43d92d4d82 100644 --- a/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx +++ b/sc/source/ui/dbgui/PivotCalcFieldDialog.cxx @@ -544,7 +544,7 @@ IMPL_LINK_NOARG(ScPivotCalcFieldDlg, DoubleClickHdl, const weld::TreeIter&, bool return true; } -IMPL_LINK_NOARG(ScPivotCalcFieldDlg, FieldListSelected, weld::TreeView&, void) +IMPL_LINK_NOARG(ScPivotCalcFieldDlg, FieldListSelected, weld::ItemView&, void) { mxBtnInsert->set_sensitive(mxFieldList->get_cursor_index() != -1); } diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 197a258072ce..1c21f1dff732 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -435,7 +435,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, weld::Button&, rBtn, void ) } } -IMPL_LINK( ScConsolidateDlg, SelectTVHdl, weld::TreeView&, rLb, void ) +IMPL_LINK(ScConsolidateDlg, SelectTVHdl, weld::ItemView&, rLb, void) { if (rLb.get_selected_index() != -1) m_xBtnRemove->set_sensitive(true); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d95a616d339e..ca05772bcdad 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -340,7 +340,7 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) // Handler: -IMPL_LINK(ScTpSubTotalGroup, SelectTreeListBoxHdl, weld::TreeView&, rLb, void) +IMPL_LINK(ScTpSubTotalGroup, SelectTreeListBoxHdl, weld::ItemView&, rLb, void) { SelectHdl(&rLb); diff --git a/sc/source/ui/dialogs/SelectSheetViewDialog.cxx b/sc/source/ui/dialogs/SelectSheetViewDialog.cxx index af938e490b62..074b957d8064 100644 --- a/sc/source/ui/dialogs/SelectSheetViewDialog.cxx +++ b/sc/source/ui/dialogs/SelectSheetViewDialog.cxx @@ -77,7 +77,7 @@ SelectSheetViewDialog::SelectSheetViewDialog(weld::Window* pParent, ScViewData& SelectSheetViewDialog::~SelectSheetViewDialog() {} -IMPL_LINK_NOARG(SelectSheetViewDialog, NameModifyHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SelectSheetViewDialog, NameModifyHdl, weld::ItemView&, void) { m_nCurrentIndex = m_xEntryTree->get_selected_id().toInt32(); } diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index f54e1a080088..b11a9340298f 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -206,7 +206,7 @@ IMPL_LINK(SearchResultsDlg, HeaderBarClick, int, nColumn, void) } } -IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG(SearchResultsDlg, ListSelectHdl, weld::ItemView&, void) { if (!mpDoc) return; diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index c24605f17cd9..19532e942fba 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -565,7 +565,7 @@ IMPL_LINK_NOARG(ScFunctionWin, SelComboHdl, weld::ComboBox&, void) SetDescription(); } -IMPL_LINK_NOARG(ScFunctionWin, SelTreeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScFunctionWin, SelTreeHdl, weld::ItemView&, void) { bool bSensitivity = weld::fromId(xFuncList->get_selected_id()); xHelpButton->set_sensitive(bSensitivity); diff --git a/sc/source/ui/inc/PivotCalcFieldDialog.hxx b/sc/source/ui/inc/PivotCalcFieldDialog.hxx index 712436c8566a..31cfa5b5958d 100644 --- a/sc/source/ui/inc/PivotCalcFieldDialog.hxx +++ b/sc/source/ui/inc/PivotCalcFieldDialog.hxx @@ -87,7 +87,7 @@ private: DECL_LINK(AddModClicked, weld::Button&, void); DECL_LINK(DeleteClicked, weld::Button&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(FieldListSelected, weld::TreeView&, void); + DECL_LINK(FieldListSelected, weld::ItemView&, void); DECL_LINK(CalcFieldNameSelected, weld::ComboBox&, void); DECL_LINK(CalcEntryChanged, weld::TextView&, void); }; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index ca6b4a20009a..e7e6c95b1479 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -94,7 +94,7 @@ class ScAcceptChgDlg final : public SfxModelessDialogController DECL_LINK( RejectAllHandle, SvxTPView*, void ); DECL_LINK( AcceptAllHandle, SvxTPView*, void ); DECL_LINK( ExpandingHandle, const weld::TreeIter&, bool ); - DECL_LINK( SelectHandle, weld::TreeView&, void ); + DECL_LINK(SelectHandle, weld::ItemView&, void); DECL_LINK( RefInfoHandle, const OUString*, void ); DECL_LINK( UpdateSelectionHdl, Timer*, void ); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index ac0659955141..5acb7f1c6890 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -275,7 +275,7 @@ private: DECL_LINK(EdActivateHdl, weld::Entry&, bool); DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(TreeSizeAllocHdl, const Size&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(MenuKeyInputHdl, const KeyEvent&, bool); @@ -419,7 +419,7 @@ private: bool mbColorMenu; DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); - DECL_LINK(ColorSelChangedHdl, weld::TreeView&, void); + DECL_LINK(ColorSelChangedHdl, weld::ItemView&, void); DECL_LINK(MenuKeyInputHdl, const KeyEvent&, bool); void SetupMenu(weld::TreeView& rMenu); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index b33de7bda53d..3f3cdf6a1375 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -130,7 +130,7 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK( SelectHandle, weld::TreeView&, void ); + DECL_LINK(SelectHandle, weld::ItemView&, void); DECL_LINK( UpdateSelectionHdl, Timer*, void ); DECL_LINK( KeepMineHandle, weld::Button&, void ); DECL_LINK( KeepOtherHandle, weld::Button&, void ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index b7261e7a206f..b2a46ccd6725 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -88,7 +88,7 @@ private: DECL_LINK( GetFocusHdl, weld::Widget&, void ); DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); DECL_LINK( ModifyHdl, formula::RefEdit&, void ); - DECL_LINK( SelectTVHdl, weld::TreeView&, void ); + DECL_LINK(SelectTVHdl, weld::ItemView&, void); DECL_LINK( SelectCBHdl, weld::ComboBox&, void ); static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 751648aab135..51672b432ab1 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -80,7 +80,7 @@ private: DECL_LINK( OkBtnHdl, weld::Button&, void ); DECL_LINK( AddBtnHdl, weld::Button&, void ); DECL_LINK( RemoveBtnHdl, weld::Button&, void ); - DECL_LINK( Range1SelectHdl, weld::TreeView&, void ); + DECL_LINK(Range1SelectHdl, weld::ItemView&, void); DECL_LINK( Range1DataModifyHdl, formula::RefEdit&, void ); DECL_LINK( ColRowToggleHdl, weld::Toggleable&, void ); DECL_LINK( Range2DataModifyHdl, formula::RefEdit&, void ); diff --git a/sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx b/sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx index 95320e0f4d31..e108e1259435 100644 --- a/sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx +++ b/sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx @@ -31,7 +31,7 @@ class SelectSheetViewDialog : public weld::GenericDialogController std::vector m_aEntries; sal_Int32 m_nCurrentIndex = -1; - DECL_LINK(NameModifyHdl, weld::TreeView&, void); + DECL_LINK(NameModifyHdl, weld::ItemView&, void); public: SelectSheetViewDialog(weld::Window* pParent, ScViewData& rViewData); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 80a3f2fab369..7e1f056c644d 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -83,7 +83,7 @@ private: DECL_LINK( SetHelpClickHdl, weld::Button&, void ); DECL_LINK( SetSimilarityToggleHdl, weld::Toggleable&, void ); DECL_LINK( SelComboHdl, weld::ComboBox&, void ); - DECL_LINK( SelTreeHdl, weld::TreeView&, void ); + DECL_LINK(SelTreeHdl, weld::ItemView&, void); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index f4d6c8953287..1f1414703791 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -86,7 +86,7 @@ private: DECL_LINK( BrowseHdl_Impl, weld::Button&, void ); DECL_LINK( ChoiceHdl_Impl, weld::Toggleable&, void ); - DECL_LINK( SelectHdl_Impl, weld::TreeView&, void ); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK( CountHdl_Impl, weld::SpinButton&, void ); DECL_LINK( DoEnterHdl, weld::Button&, void ); DECL_LINK( BrowseTimeoutHdl, Timer *, void ); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index ea3b78b43be0..1fe8bda26642 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -47,7 +47,7 @@ private: DECL_LINK(FileHdl, weld::ComboBox&, bool); DECL_LINK(BrowseHdl, weld::Button&, void); - DECL_LINK(RangeHdl, weld::TreeView&, void); + DECL_LINK(RangeHdl, weld::ItemView&, void); DECL_LINK(ReloadHdl, weld::Toggleable&, void); DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 4ee3592b7ceb..d6544f6e2c6c 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -100,7 +100,7 @@ private: DECL_LINK(RefEdModifyHdl, formula::RefEdit&, void); DECL_LINK(EdModifyCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(AssignGetFocusHdl, formula::RefEdit&, void); - DECL_LINK(SelectionChangedHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectionChangedHdl_Impl, weld::ItemView&, void); DECL_LINK(ScopeChangedHdl, weld::ComboBox&, void); protected: diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index d1ba4dc1e9fb..cc256b862a24 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -62,7 +62,7 @@ public: void CheckForFormulaString(); int n_children() const { return m_xTreeView->n_children(); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index dafa5f4591a9..54862f488019 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -80,7 +80,7 @@ private: void DeleteScenario(); const ScenarioEntry* GetSelectedScenarioEntry() const; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(ContextMenuHdl, const CommandEvent&, bool); diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index a0f569fbb898..672a58c56c28 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -29,7 +29,7 @@ class SearchResultsDlg : public SfxDialogController std::unique_ptr mxSearchResults; std::unique_ptr mxShowDialog; - DECL_LINK(ListSelectHdl, weld::TreeView&, void); + DECL_LINK(ListSelectHdl, weld::ItemView&, void); DECL_LINK(HeaderBarClick, int, void); DECL_STATIC_LINK(SearchResultsDlg, OnShowToggled, weld::Toggleable&, void); public: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 11b79f491b19..31c03ff1825c 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -76,7 +76,7 @@ class ScSolverOptionsDialog : public weld::GenericDialogController std::shared_ptr m_xValDialog; DECL_LINK( EngineSelectHdl, weld::ComboBox&, void ); - DECL_LINK( SettingsSelHdl, weld::TreeView&, void ); + DECL_LINK(SettingsSelHdl, weld::ItemView&, void); DECL_LINK(SettingsDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK( ButtonHdl, weld::Button&, void ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 627fbc081daa..3ec5d36ccc13 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -50,7 +50,7 @@ private: // Handler ------------------------ DECL_LINK( SelectListBoxHdl, weld::ComboBox&, void ); - DECL_LINK( SelectTreeListBoxHdl, weld::TreeView&, void ); + DECL_LINK(SelectTreeListBoxHdl, weld::ItemView&, void); DECL_LINK(CheckHdl, const weld::TreeView::iter_col&, void); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); void SelectHdl(const weld::Widget*); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 7629accd4a2d..9bef12e0c7a1 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -85,7 +85,7 @@ private: const ScRefAddress& rEndPos ); // Handler: - DECL_LINK( LbSelectHdl, weld::TreeView&, void ); + DECL_LINK(LbSelectHdl, weld::ItemView&, void); DECL_LINK( BtnClickHdl, weld::Button&, void ); DECL_LINK( EdEntriesModHdl, weld::TextView&, void); }; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index c34da326b661..b9fa64ebd977 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -100,7 +100,7 @@ private: void RefEditModified(); DECL_LINK(BtnPressedHdl, weld::Button&, void); - DECL_LINK(TreeItemSelectHdl, weld::TreeView&, void); + DECL_LINK(TreeItemSelectHdl, weld::ItemView&, void); DECL_LINK(RefModifiedHdl, formula::RefEdit&, void); }; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 6b6a84e57dc5..663899094ed7 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1007,7 +1007,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) m_xDialog->set_busy_cursor(false); } -IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle, weld::TreeView&, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle, weld::ItemView&, void) { if (!bNoSelection) aSelectionIdle.Start(); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index a8513e0a36c7..6e40c01066a9 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -433,7 +433,7 @@ void ScConflictsDlg::HandleListBoxSelection() } } -IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle, weld::TreeView&, void) +IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle, weld::ItemView&, void) { if (mbInSelectHdl) return; diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 6adc16e46c48..6d22b259e550 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -609,7 +609,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, weld::Button&, void) } // handler called when a row in the listbox is selected, updates form input fields -IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, weld::ItemView&, void) { sal_Int32 nSelectPos = m_xLbRange->get_selected_index(); const sal_Int32 nCnt = m_xLbRange->n_children(); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 86fb40655001..688387a94052 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -271,7 +271,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl, weld::Button&, void) pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl, weld::ItemView&, void) { DoEnable_Impl(); } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index f73f7ac5e76d..9cbeb89bbba4 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -166,7 +166,7 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF UpdateEnable(); } -IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, weld::ItemView&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 591021baaf5c..620be14fcc67 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -329,7 +329,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl, weld::ComboBox&, void) } } -IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl, weld::ItemView&, void) { bool bCheckbox = false; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index f5d6a9b881f9..b7326b9c41e3 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -526,7 +526,7 @@ IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl, formula::RefEdit&, void) RefEdModifyHdl(*m_xEdAssign); } -IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl, weld::ItemView&, void) { SelectionChanged(); } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 7ecafe716397..3b6267009820 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -87,7 +87,7 @@ void ScScenarioWindow::UpdateEntries( const std::vector &rNewEntryList } } -IMPL_LINK_NOARG(ScScenarioWindow, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScScenarioWindow, SelectHdl, weld::ItemView&, void) { if (const ScenarioEntry* pEntry = GetSelectedScenarioEntry()) SetComment(pEntry->maComment); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index e82cf679855e..74264aea30a8 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -455,7 +455,7 @@ void ScTpUserLists::RemoveList( size_t nList ) // Handler: -IMPL_LINK( ScTpUserLists, LbSelectHdl, weld::TreeView&, rLb, void ) +IMPL_LINK(ScTpUserLists, LbSelectHdl, weld::ItemView&, rLb, void) { if ( &rLb != mxLbLists.get() ) return; diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 67a5c4f7c67e..b39b6d58a588 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -611,7 +611,7 @@ IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, weld::Button&, rBtn, void) CancelPressed(); } -IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl, weld::ItemView&, void) { TreeItemSelected(); } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index cb579b048be0..1c01e830dfe4 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -998,7 +998,7 @@ void CustomAnimationList::onSelectionChanged(const Any& rSelection) } } -IMPL_LINK_NOARG(CustomAnimationList, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CustomAnimationList, SelectHdl, weld::ItemView&, void) { Select(); } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 88996e6d3930..9ab30d2d44e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2092,7 +2092,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl, weld::Widget&, void) mrBase.GetDocShell()->SetModified(); } -IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, weld::ItemView&, void) { maIdle.Start(); } diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 8a95153a0d4a..ec1d0ec4e032 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -691,7 +691,7 @@ void SvxBulletAndPositionDlg::CheckForStartValue_Impl(sal_uInt16 nNumberingType) SpinModifyHdl_Impl(*m_xStartED); } -IMPL_LINK_NOARG(SvxBulletAndPositionDlg, LevelHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxBulletAndPositionDlg, LevelHdl_Impl, weld::ItemView&, void) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 1dd0eb9ee4d2..ea3c72b8caae 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, weld::Button&, void) EnableDisableButtons(); } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::ItemView&, void) { OUString sImgUrl = m_xImagesLst->get_selected_id(); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 77e2f6f187b0..225e1573409b 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -67,7 +67,7 @@ private: DECL_LINK(DownHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(TypeSelectHdl, weld::ComboBox&, void); Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout, diff --git a/sd/source/ui/dlg/SelectLayerDlg.cxx b/sd/source/ui/dlg/SelectLayerDlg.cxx index 89471d5f6634..a8fdb03ca08b 100644 --- a/sd/source/ui/dlg/SelectLayerDlg.cxx +++ b/sd/source/ui/dlg/SelectLayerDlg.cxx @@ -41,7 +41,7 @@ IMPL_LINK_NOARG(SdSelectLayerDlg, DoubleClickHdl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(SdSelectLayerDlg, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SdSelectLayerDlg, SelectHdl, weld::ItemView&, void) { m_xOk->set_sensitive(m_xListLB->get_selected_index() != -1); } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 4e7492267af1..fa39520ee0a6 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -101,7 +101,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, weld::Button&, r, void ) SelectHdl(&r); } -IMPL_LINK( SdCustomShowDlg, SelectListBoxHdl, weld::TreeView&, rListBox, void ) +IMPL_LINK(SdCustomShowDlg, SelectListBoxHdl, weld::ItemView&, rListBox, void) { SelectHdl(&rListBox); } @@ -324,12 +324,12 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, weld::Button&, rWidget, void ) ClickButtonHdl2(&rWidget); } -IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl3, weld::TreeView&, rWidget, void ) +IMPL_LINK(SdDefineCustomShowDlg, ClickButtonHdl3, weld::ItemView&, rWidget, void) { ClickButtonHdl2(&rWidget); } -IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl4, weld::TreeView&, rListBox, void ) +IMPL_LINK(SdDefineCustomShowDlg, ClickButtonHdl4, weld::ItemView&, rListBox, void) { ClickButtonHdl2(&rListBox); } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 4d6bacf4be69..4b270b1ed1a8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -848,7 +848,7 @@ IMPL_LINK(SdPageObjsTLV, EditedEntryHdl, const IterString&, rIterString, bool) return true; } -IMPL_LINK_NOARG(SdPageObjsTLV, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SdPageObjsTLV, SelectHdl, weld::ItemView&, void) { if (m_nSelectEventId) Application::RemoveUserEvent(m_nSelectEventId); diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 22ab57d9e169..227e7efd54d2 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -126,7 +126,7 @@ class SvxBulletAndPositionDlg final : public weld::GenericDialogController void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void); - DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); + DECL_LINK(LevelHdl_Impl, weld::ItemView&, void); DECL_LINK(GraphicHdl_Impl, const OUString&, void); DECL_LINK(BulletHdl_Impl, weld::Button&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); diff --git a/sd/source/ui/inc/CustomAnimationList.hxx b/sd/source/ui/inc/CustomAnimationList.hxx index 114d43b3a720..8279259458b7 100644 --- a/sd/source/ui/inc/CustomAnimationList.hxx +++ b/sd/source/ui/inc/CustomAnimationList.hxx @@ -133,7 +133,7 @@ private: bool mbIgnorePaint; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(CommandHdl, const CommandEvent&, bool); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(DragBeginHdl, bool&, bool); diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx index fe0acdb5c911..12c3d2195835 100644 --- a/sd/source/ui/inc/CustomAnimationPane.hxx +++ b/sd/source/ui/inc/CustomAnimationPane.hxx @@ -112,7 +112,7 @@ private: DECL_LINK( DelayModifiedHdl, weld::MetricSpinButton&, void ); DECL_LINK( DelayLoseFocusHdl, weld::Widget&, void ); DECL_LINK( UpdateAnimationLB, weld::ComboBox&, void ); - DECL_LINK( AnimationSelectHdl, weld::TreeView&, void ); + DECL_LINK(AnimationSelectHdl, weld::ItemView&, void); DECL_LINK( SelectionHandler, Timer*, void ); void implControlHdl(const weld::Widget* pControl); diff --git a/sd/source/ui/inc/SelectLayerDlg.hxx b/sd/source/ui/inc/SelectLayerDlg.hxx index cf4139799fc8..c1473743f586 100644 --- a/sd/source/ui/inc/SelectLayerDlg.hxx +++ b/sd/source/ui/inc/SelectLayerDlg.hxx @@ -28,7 +28,7 @@ class SdSelectLayerDlg final : public weld::GenericDialogController std::unique_ptr m_xListLB; DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: explicit SdSelectLayerDlg(weld::Window* pParent); diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 6e9874853c65..4f6132e75986 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -45,7 +45,7 @@ private: void CheckState(); DECL_LINK( ClickButtonHdl, weld::Button&, void ); - DECL_LINK( SelectListBoxHdl, weld::TreeView&, void ); + DECL_LINK(SelectListBoxHdl, weld::ItemView&, void); DECL_LINK( StartShowHdl, weld::Button&, void ); void SelectHdl(void const *); @@ -76,8 +76,8 @@ private: DECL_LINK( ClickButtonHdl, weld::Button&, void ); DECL_LINK( ClickButtonEditHdl, weld::Entry&, void ); - DECL_LINK( ClickButtonHdl3, weld::TreeView&, void ); - DECL_LINK( ClickButtonHdl4, weld::TreeView&, void ); + DECL_LINK(ClickButtonHdl3, weld::ItemView&, void); + DECL_LINK(ClickButtonHdl4, weld::ItemView&, void); DECL_LINK( OKHdl, weld::Button&, void ); void ClickButtonHdl2(void const *); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 91d3ab05ed77..0a12bc7f6b8c 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -136,7 +136,7 @@ private: void CloseBookmarkDoc(); DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(AsyncSelectHdl, void*, void); DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool); DECL_LINK(AsyncRowActivatedHdl, void*, void); diff --git a/sfx2/inc/DevelopmentToolDockingWindow.hxx b/sfx2/inc/DevelopmentToolDockingWindow.hxx index 6d3e1f358cce..b2c89a9b87c5 100644 --- a/sfx2/inc/DevelopmentToolDockingWindow.hxx +++ b/sfx2/inc/DevelopmentToolDockingWindow.hxx @@ -49,7 +49,7 @@ private: // Handler for the object inspector tree ObjectInspectorTreeHandler maObjectInspectorTreeHandler; - DECL_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void); + DECL_LINK(DocumentModelTreeViewSelectionHandler, weld::ItemView&, void); DECL_LINK(DomToolbarButtonClicked, const OUString&, void); void updateSelection(); diff --git a/sfx2/inc/saveastemplatedlg.hxx b/sfx2/inc/saveastemplatedlg.hxx index 36f39f4b26fc..2e9291abba4f 100644 --- a/sfx2/inc/saveastemplatedlg.hxx +++ b/sfx2/inc/saveastemplatedlg.hxx @@ -41,7 +41,7 @@ private: public: DECL_LINK(OkClickHdl, weld::Button&, void); DECL_LINK(TemplateNameEditHdl, weld::Entry&, void); - DECL_LINK(SelectCategoryHdl, weld::TreeView&, void); + DECL_LINK(SelectCategoryHdl, weld::ItemView&, void); void initialize(); void SetCategoryLBEntries(const std::vector& names); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index c7b5a3f61b80..2a9b4b06d15e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -461,7 +461,7 @@ IMPL_LINK(IndexTabPage_Impl, CustomRenderHdl, weld::TreeView::render_args, aPayl rRenderContext.DrawText(aPos, aEntry); } -IMPL_LINK_NOARG(IndexTabPage_Impl, TreeChangeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(IndexTabPage_Impl, TreeChangeHdl, weld::ItemView&, void) { m_xIndexEntry->set_text(m_xIndexList->get_selected_text()); } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index ee3f37fb7cbe..4a524eff7a64 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -116,7 +116,7 @@ private: DECL_LINK(IdleHdl, Timer*, void); DECL_LINK(AutoCompleteHdl, Timer*, void); DECL_LINK(TimeoutHdl, Timer*, void); - DECL_LINK(TreeChangeHdl, weld::TreeView&, void); + DECL_LINK(TreeChangeHdl, weld::ItemView&, void); DECL_LINK(EntryChangeHdl, weld::Entry&, void); DECL_LINK(ActivateHdl, weld::Entry&, bool); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx index 6b165d3aa24b..626aa12eeb9d 100644 --- a/sfx2/source/control/templatedlglocalview.cxx +++ b/sfx2/source/control/templatedlglocalview.cxx @@ -372,7 +372,7 @@ IMPL_LINK(TemplateDlgLocalView, PopupMenuHdl, const CommandEvent&, rCEvt, bool) } } -IMPL_LINK_NOARG(TemplateDlgLocalView, ListViewChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(TemplateDlgLocalView, ListViewChangedHdl, weld::ItemView&, void) { updateSelection(); } diff --git a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx index ec0abc4be0f8..4b4c20e2fd0a 100644 --- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx +++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx @@ -59,7 +59,7 @@ DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi SetText(SfxResId(STR_OBJECT_INSPECTOR)); } -IMPL_LINK(DevelopmentToolDockingWindow, DocumentModelTreeViewSelectionHandler, weld::TreeView&, +IMPL_LINK(DevelopmentToolDockingWindow, DocumentModelTreeViewSelectionHandler, weld::ItemView&, rView, void) { if (mpDomToolbar->get_item_active(u"dom_current_selection_toggle"_ustr)) diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index e361f63bbfde..aee2a8d666d8 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -902,7 +902,7 @@ ObjectInspectorNodeInterface* BasicValueNode::createNodeObjectForAny(OUString co // Object inspector tree view helper functions namespace { -ObjectInspectorNodeInterface* getSelectedNode(weld::TreeView const& rTreeView) +ObjectInspectorNodeInterface* getSelectedNode(weld::ItemView const& rTreeView) { OUString sID = rTreeView.get_selected_id(); if (sID.isEmpty()) @@ -1063,7 +1063,7 @@ IMPL_LINK(ObjectInspectorTreeHandler, ExpandingHandlerMethods, weld::TreeIter co return true; } -IMPL_LINK(ObjectInspectorTreeHandler, SelectionChanged, weld::TreeView&, rTreeView, void) +IMPL_LINK(ObjectInspectorTreeHandler, SelectionChanged, weld::ItemView&, rTreeView, void) { bool bHaveNodeWithObject = false; mpObjectInspectorWidgets->mpTextView->set_text(u""_ustr); diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index 7e99266b850b..57313a35af2a 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -1838,13 +1838,14 @@ IMPL_LINK(StyleList, CustomRenderHdl, weld::TreeView::render_args, aPayload, voi } // Selection of a template during the Watercan-Status -IMPL_LINK(StyleList, FmtSelectHdl, weld::TreeView&, rListBox, void) +IMPL_LINK(StyleList, FmtSelectHdl, weld::ItemView&, rListBox, void) { std::unique_ptr xHdlEntry = rListBox.get_cursor(); if (!xHdlEntry) return; - m_pParentDialog->SelectStyle(rListBox.get_text(*xHdlEntry), true, *this); + weld::TreeView& rTreeView = dynamic_cast(rListBox); + m_pParentDialog->SelectStyle(rTreeView.get_text(*xHdlEntry), true, *this); } IMPL_LINK_NOARG(StyleList, TreeListApplyHdl, const weld::TreeIter&, bool) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index b81fceaeb906..71a79ce83388 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl, weld::ItemView&, void) { bool bEnable = m_xVersionBox->get_selected_index() != -1; SfxObjectShell* pObjShell = m_pViewFrame->GetObjectShell(); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index c0ae76eaa800..f1f198c592b8 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -165,7 +165,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog, Update, Timer*, void) m_xPreviewController->SetObjectShell(m_xDocShell); } -IMPL_LINK( SfxNewFileDialog, RegionSelect, weld::TreeView&, rBox, void ) +IMPL_LINK(SfxNewFileDialog, RegionSelect, weld::ItemView&, rBox, void) { if (m_xDocShell.Is() && m_xDocShell->GetProgress()) return; @@ -193,7 +193,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog, Expand, weld::Expander&, void) TemplateSelect(*m_xTemplateLb); } -IMPL_LINK_NOARG(SfxNewFileDialog, TemplateSelect, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxNewFileDialog, TemplateSelect, weld::ItemView&, void) { // Still loading if (m_xDocShell && m_xDocShell->GetProgress()) diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 41855c563734..72cf37bee695 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -92,7 +92,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, weld::Entry&, void SelectCategoryHdl(*m_xLBCategory); } -IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, weld::ItemView&, void) { if (m_xLBCategory->get_selected_index() == 0) { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index afce1847bc75..6a8f874149aa 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1271,7 +1271,7 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, weld::Entry&, voi } } -IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, weld::ItemView&, void) { if (mxLBCategory->get_selected_index() == 0) { diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index 8aea7e10edc9..8f0f52a4e7d2 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -195,7 +195,7 @@ private: DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString); DECL_LINK(CustomRenderHdl, weld::TreeView::render_args, void); - DECL_LINK(FmtSelectHdl, weld::TreeView&, void); + DECL_LINK(FmtSelectHdl, weld::ItemView&, void); DECL_LINK(TreeListApplyHdl, const weld::TreeIter&, bool); DECL_LINK(MousePressHdl, const MouseEvent&, bool); DECL_STATIC_LINK(StyleList, CustomGetSizeHdl, weld::TreeView::get_size_args, Size); diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 7af8ff1cc604..f9824b692411 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -44,7 +44,7 @@ class SfxVersionDialog final : public SfxDialogController std::unique_ptr m_xVersionBox; DECL_LINK(DClickHdl_Impl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(SelectHdl_Impl, weld::ItemView&, void); DECL_LINK(ButtonHdl_Impl, weld::Button&, void); DECL_LINK(ToggleHdl_Impl, weld::Toggleable&, void); void Init_Impl(); diff --git a/svtools/source/dialogs/dlgname.cxx b/svtools/source/dialogs/dlgname.cxx index 316503360dcb..7845cc372bdd 100644 --- a/svtools/source/dialogs/dlgname.cxx +++ b/svtools/source/dialogs/dlgname.cxx @@ -189,7 +189,7 @@ IMPL_LINK_NOARG(SvxListDialog, AddHdl_Impl, weld::Button&, void) IMPL_LINK_NOARG(SvxListDialog, EditHdl_Impl, weld::Button&, void) { EditEntry(); } -IMPL_LINK_NOARG(SvxListDialog, SelectHdl_Impl, weld::TreeView&, void) { SelectionChanged(); } +IMPL_LINK_NOARG(SvxListDialog, SelectHdl_Impl, weld::ItemView&, void) { SelectionChanged(); } IMPL_LINK_NOARG(SvxListDialog, DblClickHdl_Impl, const weld::TreeIter&, bool) { diff --git a/svx/source/dialog/TableAutoFmtDlg.cxx b/svx/source/dialog/TableAutoFmtDlg.cxx index 6865fa2a1391..8ba9e7061da2 100644 --- a/svx/source/dialog/TableAutoFmtDlg.cxx +++ b/svx/source/dialog/TableAutoFmtDlg.cxx @@ -262,7 +262,7 @@ IMPL_LINK_NOARG(SvxTableAutoFmtDlg, RenameHdl, weld::Button&, void) } } -IMPL_LINK_NOARG(SvxTableAutoFmtDlg, SelFormatHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SvxTableAutoFmtDlg, SelFormatHdl, weld::ItemView&, void) { mnIndex = mxLbFormat->get_selected_index(); UpdateChecks(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 80aa7c3c8d5f..ff8d861798b2 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -261,7 +261,7 @@ namespace svxform DoToolBoxAction(rIdent); } - IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl, weld::TreeView&, void) + IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl, weld::ItemView&, void) { EnableMenuItems(); PrepDnD(); @@ -2695,7 +2695,7 @@ namespace svxform { } - IMPL_LINK_NOARG( NamespaceItemDialog, SelectHdl, weld::TreeView&, void) + IMPL_LINK_NOARG(NamespaceItemDialog, SelectHdl, weld::ItemView&, void) { bool bEnable = m_xNamespacesList->get_selected_index() != -1; m_xEditNamespaceBtn->set_sensitive( bEnable ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 5962123fcee5..ee7ed92005b3 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1243,7 +1243,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) return DND_ACTION_COPY; } -IMPL_LINK_NOARG(FmFilterNavigator, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(FmFilterNavigator, SelectHdl, weld::ItemView&, void) { std::unique_ptr xIter = m_xTreeView->get_selected(); if (!xIter) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index d058938f40a2..65e0bed9ecb1 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1422,7 +1422,7 @@ namespace svxform m_xEditEntry.reset(); } - IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, weld::TreeView&, void) + IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, weld::ItemView&, void) { m_sdiState = SDI_DIRTY; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f34e88cf7a4d..ceb2d0c105ff 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -605,7 +605,7 @@ IMPL_LINK(GalleryBrowser, PopupMenuHdl1, const CommandEvent&, rCEvt, bool) return true; } -IMPL_LINK_NOARG(GalleryBrowser, SelectThemeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(GalleryBrowser, SelectThemeHdl, weld::ItemView&, void) { SelectTheme(GetSelectedTheme()); } @@ -1498,7 +1498,7 @@ IMPL_LINK_NOARG(GalleryBrowser, SelectObjectValueSetHdl, ValueSet*, void) ImplUpdateSelection(); } -IMPL_LINK_NOARG(GalleryBrowser, SelectObjectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(GalleryBrowser, SelectObjectHdl, weld::ItemView&, void) { ImplUpdateSelection(); } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 34b00a966b67..85fca361a9d1 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -212,7 +212,7 @@ namespace svxform bool m_bLinkOnce; DECL_LINK(TbxSelectHdl, const OUString&, void); - DECL_LINK(ItemSelectHdl, weld::TreeView&, void); + DECL_LINK(ItemSelectHdl, weld::ItemView&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(PopupMenuHdl, const CommandEvent&, bool); @@ -456,7 +456,7 @@ namespace svxform std::unique_ptr m_xDeleteNamespaceBtn; std::unique_ptr m_xOKBtn; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(ClickHdl, weld::Button&, void); DECL_LINK(OKHdl, weld::Button&, void); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 98655569476b..2c5efd1044e5 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -264,7 +264,7 @@ private: DECL_STATIC_LINK(FmFilterNavigator, CustomGetSizeHdl, weld::TreeView::get_size_args, Size); DECL_STATIC_LINK(FmFilterNavigator, CustomRenderHdl, weld::TreeView::render_args, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(EditingEntryHdl, const weld::TreeIter&, bool); typedef std::pair IterString; DECL_LINK(EditedEntryHdl, const IterString&, bool); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 57e4b2d6e4d6..f8f1d4915b7a 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -452,7 +452,7 @@ namespace svxform DECL_LINK( OnEdit, void*, void ); - DECL_LINK( OnEntrySelDesel, weld::TreeView&, void ); + DECL_LINK(OnEntrySelDesel, weld::ItemView&, void); DECL_LINK( OnSynchronizeTimer, Timer*, void ); DECL_LINK( OnClipboardAction, OLocalExchange&, void ); diff --git a/svx/source/inc/galbrws1.hxx b/svx/source/inc/galbrws1.hxx index 834b487957df..dcf52dd847e3 100644 --- a/svx/source/inc/galbrws1.hxx +++ b/svx/source/inc/galbrws1.hxx @@ -155,12 +155,12 @@ private: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; DECL_LINK(ClickNewThemeHdl, weld::Button&, void); - DECL_LINK(SelectThemeHdl, weld::TreeView&, void); + DECL_LINK(SelectThemeHdl, weld::ItemView&, void); DECL_LINK(PopupMenuHdl1, const CommandEvent&, bool); DECL_LINK(KeyInputHdl1, const KeyEvent&, bool); DECL_STATIC_LINK(GalleryBrowser, OnMoreGalleriesClick, weld::Button&, void); - DECL_LINK(SelectObjectHdl, weld::TreeView&, void); + DECL_LINK(SelectObjectHdl, weld::ItemView&, void); DECL_LINK(SelectObjectValueSetHdl, ValueSet*, void); DECL_LINK(SelectTbxHdl, weld::Toggleable&, void); DECL_LINK(PopupMenuHdl2, const CommandEvent&, bool); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 17d3a6db67e2..e6996022f314 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -459,7 +459,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl, weld::Entry&, void) updateButtons(); } -IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl, weld::ItemView&, void) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if (pE) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 5f0cf1125eaf..1b1a66c1f773 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -72,7 +72,7 @@ public: void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); } void hide() { m_xControl->hide(); } void show() { m_xControl->show(); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xControl->connect_selection_changed(rLink); } @@ -118,7 +118,7 @@ private: DECL_LINK( DirectionHdl, weld::Toggleable&, void ); DECL_LINK( EditFieldsHdl, weld::Entry&, void ); DECL_LINK( EditFieldsListBoxHdl, weld::ComboBox&, void ); - DECL_LINK( MappingSelectHdl, weld::TreeView&, void ); + DECL_LINK(MappingSelectHdl, weld::ItemView&, void); DECL_LINK( AddHdl, weld::Button&, void ); DECL_LINK( ModifyHdl, weld::Button&, void ); DECL_LINK( DeleteHdl, weld::Button&, void ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 9a3f247332a0..bb36db64ad47 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -187,7 +187,7 @@ void SwCondCollPage::AssignRemove(const weld::Widget* pBtn) m_xTbLinks->set_text(nPos, u""_ustr, 1); } -IMPL_LINK(SwCondCollPage, SelectTreeListBoxHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SwCondCollPage, SelectTreeListBoxHdl, weld::ItemView&, rBox, void) { SelectHdl(&rBox); } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 5dad20700d1a..54dc61cd6809 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -1332,7 +1332,7 @@ void SwCaptionOptPage::UpdateEntry(int nSelEntry) ModifyHdl(); } -IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, weld::ItemView&, void) { if (m_nPrevSelectedEntry != -1) SaveEntry(m_nPrevSelectedEntry); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 0ed45d2a7e1f..2c60564b37a0 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, EditHdl_Impl, weld::Button&, void) aDlg.run(); }; -IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl, weld::ItemView&, void) { sal_IntPtr nSelect = m_xListLB->get_selected_index(); Application::PostUserEvent( LINK( this, SwAddressListDialog, diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 7794a801d36d..c0f42e64648e 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -71,7 +71,7 @@ class SwAddressListDialog : public SfxDialogController DECL_LINK(LoadHdl_Impl, weld::Button&, void); DECL_LINK(CreateHdl_Impl, weld::Button&, void); DECL_LINK(RemoveHdl_Impl, weld::Button&, void); - DECL_LINK(ListBoxSelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(ListBoxSelectHdl_Impl, weld::ItemView&, void); DECL_LINK(EditHdl_Impl, weld::Button&, void); DECL_LINK(TableSelectHdl_Impl, weld::Button&, void); void TableSelectHdl(const weld::Button* pButton); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 92a407917200..cc40ba754e2d 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -59,7 +59,7 @@ SwCustomizeAddressListDialog::~SwCustomizeAddressListDialog() { } -IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, weld::ItemView&, void) { UpdateButtons(); } diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 3b405014db09..72dc59b3bcb7 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -41,7 +41,7 @@ class SwCustomizeAddressListDialog : public SfxDialogController DECL_LINK(AddRenameHdl_Impl, weld::Button&, void); DECL_LINK(DeleteHdl_Impl, weld::Button&, void); DECL_LINK(UpDownHdl_Impl, weld::Button&, void); - DECL_LINK(ListBoxSelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(ListBoxSelectHdl_Impl, weld::ItemView&, void); void UpdateButtons(); public: diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 86063d610137..eca70e951477 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -752,7 +752,7 @@ IMPL_LINK_NOARG(SwInsertDBColAutoPilot, AutoFormatHdl, weld::Button&, void) } } -IMPL_LINK(SwInsertDBColAutoPilot, TVSelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SwInsertDBColAutoPilot, TVSelectHdl, weld::ItemView&, rBox, void) { SwInsDBColumn aSrch(rBox.get_selected_text()); SwInsDBColumns::const_iterator it = m_aDBColumns.find( &aSrch ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index af962a2a0537..ac783822672f 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, weld::TreeView&, rBox, void) +IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, weld::ItemView&, rBox, void) { sal_Int32 nUserData = rBox.get_selected_id().toInt32(); // Check if the selected entry is already in the address and then forbid inserting diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 679759884064..a1f9558dff63 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -218,7 +218,7 @@ private: std::unique_ptr m_xDragWIN; DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(ListBoxSelectHdl_Impl, weld::TreeView&, void); + DECL_LINK(ListBoxSelectHdl_Impl, weld::ItemView&, void); DECL_LINK(EditModifyHdl_Impl, AddressMultiLineEdit&, void); DECL_LINK(ImageButtonHdl_Impl, weld::Button&, void); DECL_LINK(SelectionChangedHdl_Impl, bool, void); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 97f14def6c56..128c8a0452ad 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -753,8 +753,7 @@ void SwEditRegionDlg::UpdateFromSelection() m_bDontCheckPasswd = false; } - -IMPL_LINK_NOARG(SwEditRegionDlg, GetFirstEntryHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwEditRegionDlg, GetFirstEntryHdl, weld::ItemView&, void) { UpdateFromSelection(); } diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx index b8e51d4d2b8c..ccff3464f4c3 100644 --- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx @@ -52,7 +52,7 @@ DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent, DropDownFormFieldDialog::~DropDownFormFieldDialog() {} -IMPL_LINK_NOARG(DropDownFormFieldDialog, ListChangedHdl, weld::TreeView&, void) { UpdateButtons(); } +IMPL_LINK_NOARG(DropDownFormFieldDialog, ListChangedHdl, weld::ItemView&, void) { UpdateButtons(); } IMPL_LINK(DropDownFormFieldDialog, KeyPressedHdl, const KeyEvent&, rEvent, bool) { diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 5a694dd0cea3..bc1dfebdbc58 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -67,7 +67,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw) m_xUsedDBTLB->set_selection_mode(SelectionMode::Multiple); m_xUsedDBTLB->make_sorted(); - Link aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); + Link aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); m_xUsedDBTLB->connect_selection_changed(aLink); m_xAvailDBTLB->connect_changed(aLink); @@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl, weld::ItemView&, void) { TreeSelect(); } diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index ae3ca8e0265d..b11168e82e84 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -271,12 +271,12 @@ SwFieldGroup SwFieldDBPage::GetGroup() return SwFieldGroup::Database; } -IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, weld::TreeView&, rBox, void ) +IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, weld::ItemView&, rBox, void ) { TypeHdl(&rBox); } -void SwFieldDBPage::TypeHdl(const weld::TreeView* pBox) +void SwFieldDBPage::TypeHdl(const weld::ItemView* pBox) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -448,7 +448,7 @@ void SwFieldDBPage::CheckInsert() EnableInsert(bInsert, IsCurrentPage()); } -IMPL_LINK(SwFieldDBPage, TreeSelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SwFieldDBPage, TreeSelectHdl, weld::ItemView&, rBox, void) { std::unique_ptr xIter = rBox.get_selected(); if (!xIter) diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 94b879e038a5..613bcbfe6824 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -47,12 +47,12 @@ class SwFieldDBPage : public SwFieldPage std::unique_ptr m_xFormatLB; std::unique_ptr m_xFormat; - DECL_LINK( TypeListBoxHdl, weld::TreeView&, void ); + DECL_LINK(TypeListBoxHdl, weld::ItemView&, void); DECL_LINK( NumSelectHdl, weld::ComboBox&, void ); - DECL_LINK( TreeSelectHdl, weld::TreeView&, void ); + DECL_LINK(TreeSelectHdl, weld::ItemView&, void); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( AddDBHdl, weld::Button&, void ); - void TypeHdl(const weld::TreeView*); + void TypeHdl(const weld::ItemView*); void CheckInsert(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 71045c723727..e96ae7da4415 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -249,7 +249,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, weld::ItemView&, void) { // current ListBoxPos if (std::unique_ptr pSelected = m_pTypeView->get_selected()) @@ -260,7 +260,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, weld::TreeView&, void) SubTypeHdl(*m_xSelectionLB); } -IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, weld::ItemView&, void) { SwDocInfoSubType nSubType = static_cast(m_pTypeView->get_id(*m_xSelEntry).toUInt32()); sal_Int32 nPos = m_xSelectionLB->get_selected_index(); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index fe81c13ef0cd..06d926ea5f32 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -43,8 +43,8 @@ class SwFieldDokInfPage : public SwFieldPage std::unique_ptr m_xFormatLB; std::unique_ptr m_xFixedCB; - DECL_LINK(TypeHdl, weld::TreeView&, void); - DECL_LINK(SubTypeHdl, weld::TreeView&, void); + DECL_LINK(TypeHdl, weld::ItemView&, void); + DECL_LINK(SubTypeHdl, weld::ItemView&, void); sal_Int32 FillSelectionLB(SwDocInfoSubType nSubTypeId); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 60bf62d4709f..32cf2b6475ee 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -188,7 +188,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::ItemView&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -282,7 +282,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&, void) } } } - m_xSelectionLB->connect_selection_changed(Link()); + m_xSelectionLB->connect_selection_changed(Link()); } else { @@ -442,7 +442,7 @@ void SwFieldDokPage::AddSubType(SwFieldTypesEnum nTypeId) m_xSelectionLB->append(OUString::number(static_cast(nTypeId)), SwFieldType::GetTypeStr(nTypeId)); } -IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, weld::ItemView&, void) { sal_Int32 nPos = m_xSelectionLB->get_selected_index(); if(nPos == -1) @@ -520,7 +520,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(SwFieldTypesEnum nTypeId) return nSize; } -IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, weld::ItemView&, void) { SwFieldTypesEnum nTypeId = static_cast(m_xTypeLB->get_id(GetTypeSel()).toUInt32()); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 8cd5c36874c1..e07eada83bfe 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -45,9 +45,9 @@ class SwFieldDokPage : public SwFieldPage std::unique_ptr m_xNumFormatLB; std::unique_ptr m_xFixedCB; - DECL_LINK(TypeHdl, weld::TreeView&, void); - DECL_LINK(FormatHdl, weld::TreeView&, void); - DECL_LINK(SubTypeHdl, weld::TreeView&, void); + DECL_LINK(TypeHdl, weld::ItemView&, void); + DECL_LINK(FormatHdl, weld::ItemView&, void); + DECL_LINK(SubTypeHdl, weld::ItemView&, void); void AddSubType(SwFieldTypesEnum nTypeId); sal_Int32 FillFormatLB(SwFieldTypesEnum nTypeId); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 321a4624b368..1206013ecf56 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -189,7 +189,7 @@ const TranslateId FMT_MARK_ARY[] = FMT_MARK_OLE }; -IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, weld::ItemView&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -387,7 +387,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, weld::TreeView&, void) EnableInsert(bInsert, IsCurrentPage()); } -IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, weld::ItemView&, void) { const SwFieldTypesEnum nTypeId = static_cast(m_xTypeLB->get_id(GetTypeSel()).toUInt32()); @@ -457,7 +457,7 @@ void SwFieldFuncPage::ListModifyHdl(const weld::Widget* pControl) ListEnableHdl(*m_xListItemED); } -IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, weld::ItemView&, void) { ListEnableHdl(*m_xListItemED); } diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index d0500e915c10..8a751489e61e 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -57,14 +57,14 @@ class SwFieldFuncPage : public SwFieldPage std::unique_ptr m_xListDownPB; std::unique_ptr m_xListNameED; - DECL_LINK( TypeHdl, weld::TreeView&, void ); - DECL_LINK( SelectHdl, weld::TreeView&, void ); + DECL_LINK(TypeHdl, weld::ItemView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(InsertMacroHdl, const weld::TreeIter&, bool ); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( ListModifyReturnActionHdl, weld::Entry&, bool ); DECL_LINK( ListModifyButtonHdl, weld::Button&, void ); DECL_LINK( ListEnableHdl, weld::Entry&, void ); - DECL_LINK( ListEnableListBoxHdl, weld::TreeView&, void ); + DECL_LINK(ListEnableListBoxHdl, weld::ItemView&, void); void ListModifyHdl(const weld::Widget*); // select Macro diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 66fbf3701dbe..b8aefc64b850 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -314,7 +314,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, weld::ItemView&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -458,17 +458,17 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, weld::TreeView&, void) ModifyHdl(*m_xFilterED); } -IMPL_LINK_NOARG(SwFieldRefPage, SubTypeTreeListBoxHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeTreeListBoxHdl, weld::ItemView&, void) { SubTypeHdl(); } -IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, weld::ItemView&, void) { SubTypeHdl(); } -IMPL_LINK_NOARG(SwFieldRefPage, FormatHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldRefPage, FormatHdl, weld::ItemView&, void) { SubTypeHdl(); } diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 139116ea041c..901a0efeefb1 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -62,12 +62,12 @@ class SwFieldRefPage : public SwFieldPage std::unique_ptr m_xStylerefFromBottomCB; std::unique_ptr m_xStylerefHideNonNumericalCB; - DECL_LINK(TypeHdl, weld::TreeView&, void); - DECL_LINK(SubTypeListBoxHdl, weld::TreeView&, void); - DECL_LINK(SubTypeTreeListBoxHdl, weld::TreeView&, void); + DECL_LINK(TypeHdl, weld::ItemView&, void); + DECL_LINK(SubTypeListBoxHdl, weld::ItemView&, void); + DECL_LINK(SubTypeTreeListBoxHdl, weld::ItemView&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); - DECL_LINK(FormatHdl, weld::TreeView&, void); + DECL_LINK(FormatHdl, weld::ItemView&, void); void SubTypeHdl(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index cffb8752caad..31fbb8c7a1f3 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -204,7 +204,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, weld::ItemView&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -234,7 +234,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, weld::TreeView&, void) m_bInit = false; } -IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, weld::TreeView&, rBox, void ) +IMPL_LINK(SwFieldVarPage, SubTypeListBoxHdl, weld::ItemView&, rBox, void) { SubTypeHdl(&rBox); } @@ -252,7 +252,7 @@ static inline sal_uInt32 lcl_getUsedNumFormat( const SwNumFormatTreeView& rNumFo return nNumberFormat; } -void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox) +void SwFieldVarPage::SubTypeHdl(const weld::ItemView* pBox) { SwFieldTypesEnum nTypeId = static_cast(m_xTypeLB->get_id(GetTypeSel()).toUInt32()); sal_Int32 nSelPos = m_xSelectionLB->get_selected_index(); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index ced8a0668779..20fc9bc6be52 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -54,15 +54,15 @@ class SwFieldVarPage : public SwFieldPage sal_uInt32 m_nOldFormat; bool m_bInit; - DECL_LINK( TypeHdl, weld::TreeView&, void ); - DECL_LINK( SubTypeListBoxHdl, weld::TreeView&, void ); + DECL_LINK(TypeHdl, weld::ItemView&, void); + DECL_LINK(SubTypeListBoxHdl, weld::ItemView&, void); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( ModifyValueHdl, weld::TextView&, void ); DECL_LINK( TBClickHdl, weld::Button&, void ); DECL_LINK( ChapterHdl, weld::ComboBox&, void ); DECL_LINK( SeparatorHdl, weld::Entry&, void ); DECL_LINK(SubTypeInsertHdl, const weld::TreeIter&, bool); - void SubTypeHdl(const weld::TreeView*); + void SubTypeHdl(const weld::ItemView*); void UpdateSubType(); void FillFormatLB(SwFieldTypesEnum nTypeId); diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 0696c0807175..9ca0e5481cf5 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -56,7 +56,7 @@ public: m_xControl->selected_foreach(func); } - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xControl->connect_selection_changed(rLink); } @@ -115,7 +115,7 @@ class SwInsertBookmarkDlg final : public SfxDialogController DECL_LINK(EditTextHdl, weld::Button&, void); DECL_LINK(RenameHdl, weld::Button&, void); DECL_LINK(GotoHdl, weld::Button&, void); - DECL_LINK(SelectionChangedHdl, weld::TreeView&, void); + DECL_LINK(SelectionChangedHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(HeaderBarClick, int, void); DECL_LINK(ChangeHideHdl, weld::Toggleable&, void); diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index b9d49d83252b..e5bcc79b3602 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -88,7 +88,7 @@ class SwEditRegionDlg final : public SfxDialogController size_t FindArrPos(const SwSectionFormat* pFormat); void UpdateFromSelection(); - DECL_LINK(GetFirstEntryHdl, weld::TreeView&, void); + DECL_LINK(GetFirstEntryHdl, weld::ItemView&, void); DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(NameEditHdl, weld::Entry&, void); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 8860c1e6cb8b..f663c2abd9ae 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2463,7 +2463,7 @@ void SwTOXEntryTabPage::WriteBackLevel() } } -void SwTOXEntryTabPage::LevelHdlImpl(weld::TreeView& rBox, bool bGrabFocus) +void SwTOXEntryTabPage::LevelHdlImpl(weld::ItemView& rBox, bool bGrabFocus) { if (m_bInLevelHdl) return; @@ -2505,7 +2505,7 @@ void SwTOXEntryTabPage::LevelHdlImpl(weld::TreeView& rBox, bool bGrabFocus) } } -IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::ItemView&, rBox, void) { LevelHdlImpl(rBox, true); } @@ -3750,7 +3750,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, const weld::TreeIter&, bool) } // enable only when selected -IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, weld::ItemView&, void) { m_xStdBT->set_sensitive(m_xLevelLB->get_selected_index() != -1); diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index e92c8fa5341a..612c841a1d1d 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -44,7 +44,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) m_xTextFT->set_label(m_rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); } -IMPL_LINK(SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void) +IMPL_LINK(SwMultiTOXMarkDlg, SelectHdl, weld::ItemView&, rBox, void) { if (rBox.get_selected_index() != -1) { diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index d85aa64dbc67..33693d7fff10 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -142,7 +142,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DoubleClickHdl, const weld::TreeIter&, bool return true; } -IMPL_LINK_NOARG(SwInsertBookmarkDlg, SelectionChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwInsertBookmarkDlg, SelectionChangedHdl, weld::ItemView&, void) { if (!ValidateBookmarks()) return; diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx index ac07b611c7d3..cfb51ef2fbbf 100644 --- a/sw/source/ui/misc/contentcontroldlg.cxx +++ b/sw/source/ui/misc/contentcontroldlg.cxx @@ -444,7 +444,7 @@ IMPL_LINK_NOARG(SwContentControlDlg, MoveDownHdl, weld::Button&, void) m_xListItems->select(nRow); } -IMPL_LINK_NOARG(SwContentControlDlg, SelectionChangedHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwContentControlDlg, SelectionChangedHdl, weld::ItemView&, void) { int nRow = m_xListItems->get_selected_index(); if (nRow < 0) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index e076b906a81f..5a203c3a1fef 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -190,7 +190,7 @@ void SwGlossaryGroupDlg::Apply() } } -IMPL_LINK_NOARG( SwGlossaryGroupDlg, SelectHdl, weld::TreeView&, void ) +IMPL_LINK_NOARG(SwGlossaryGroupDlg, SelectHdl, weld::ItemView&, void) { m_xNewPB->set_sensitive(false); int nFirstEntry = m_xGroupTLB->get_selected_index(); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index eb899990d389..39ea38fe11b8 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -432,7 +432,7 @@ void SwGlossaryDlg::SelectGroup() } } -IMPL_LINK_NOARG(SwGlossaryDlg, GrpSelect, weld::TreeView&, void) +IMPL_LINK_NOARG(SwGlossaryDlg, GrpSelect, weld::ItemView&, void) { SelectGroup(); } diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 8f7a0cb87144..45bbddffa31b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -553,7 +553,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, weld::ComboBox&, void) SetModified(); } -IMPL_LINK_NOARG(SwNumPositionTabPage, LevelHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, LevelHdl, weld::ItemView&, void) { sal_uInt16 nSaveNumLvl = m_nActNumLvl; m_nActNumLvl = 0; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 6cb03eb9bb52..e224b5468d48 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -65,7 +65,7 @@ class SwNumNamesDlg : public weld::GenericDialogController std::unique_ptr m_xOKBtn; DECL_LINK( ModifyHdl, weld::Entry&, void ); - DECL_LINK( SelectHdl, weld::TreeView&, void ); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); public: @@ -78,7 +78,7 @@ public: } // remember selected entry -IMPL_LINK( SwNumNamesDlg, SelectHdl, weld::TreeView&, rBox, void ) +IMPL_LINK(SwNumNamesDlg, SelectHdl, weld::ItemView&, rBox, void) { m_xFormEdit->set_text(rBox.get_selected_text()); m_xFormEdit->select_region(0, -1); @@ -561,7 +561,7 @@ void SwOutlineSettingsTabPage::ApplyLevelSelection() Update(); } -IMPL_LINK_NOARG(SwOutlineSettingsTabPage, LevelHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, LevelHdl, weld::ItemView&, void) { ApplyLevelSelection(); } diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 412493ce3916..eb9dcbed80b3 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -273,7 +273,7 @@ IMPL_LINK(SwConvertTableDlg, CheckHdl, weld::Toggleable&, rBtn, void) } } -IMPL_LINK_NOARG(SwConvertTableDlg, SelFormatHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwConvertTableDlg, SelFormatHdl, weld::ItemView&, void) { m_nIndex = m_xLbFormat->get_selected_index(); if (m_nIndex == -1) diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 83c8dfddfa7d..4eb473b69609 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -146,7 +146,7 @@ void SwInsTableDlg::InitAutoTableFormat() SelFormatHdl( *m_xLbFormat ); } -IMPL_LINK_NOARG(SwInsTableDlg, SelFormatHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwInsTableDlg, SelFormatHdl, weld::ItemView&, void) { // Get index of selected item from the listbox int styleIdx = m_xLbFormat->get_selected_index(); diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx index 4564379e1280..a625ebcc6862 100644 --- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx @@ -38,7 +38,7 @@ private: std::unique_ptr m_xListUpButton; std::unique_ptr m_xListDownButton; - DECL_LINK(ListChangedHdl, weld::TreeView&, void); + DECL_LINK(ListChangedHdl, weld::ItemView&, void); DECL_LINK(KeyPressedHdl, const KeyEvent&, bool); DECL_LINK(EntryChangedHdl, weld::Entry&, void); DECL_LINK(ButtonPushedHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/QuickFindPanel.hxx b/sw/source/uibase/inc/QuickFindPanel.hxx index 9445313a1d19..0415ba906bb3 100644 --- a/sw/source/uibase/inc/QuickFindPanel.hxx +++ b/sw/source/uibase/inc/QuickFindPanel.hxx @@ -76,7 +76,7 @@ private: DECL_LINK(SearchComboBoxKeyInputHandler, const KeyEvent&, bool); DECL_LINK(SearchFindsListCustomGetSizeHandler, weld::TreeView::get_size_args, Size); DECL_LINK(SearchFindsListRender, weld::TreeView::render_args, void); - DECL_LINK(SearchFindsListSelectionChangedHandler, weld::TreeView&, void); + DECL_LINK(SearchFindsListSelectionChangedHandler, weld::ItemView&, void); DECL_LINK(SearchFindsListRowActivatedHandler, const weld::TreeIter&, bool); DECL_LINK(SearchFindsListKeyPressHandler, const KeyEvent&, bool); DECL_LINK(SearchOptionsToolbarClickedHandler, const OUString&, void); diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index a56fdd36285f..c1d832a8adf8 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -38,7 +38,7 @@ class SwChangeDBDlg final : public SfxDialogController void TreeSelect(); - DECL_LINK(TreeSelectHdl, weld::TreeView&, void); + DECL_LINK(TreeSelectHdl, weld::ItemView&, void); DECL_LINK(ButtonHdl, weld::Button&, void); DECL_LINK(AddDBHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/contentcontroldlg.hxx b/sw/source/uibase/inc/contentcontroldlg.hxx index 136a953968d7..1f3c1635dce7 100644 --- a/sw/source/uibase/inc/contentcontroldlg.hxx +++ b/sw/source/uibase/inc/contentcontroldlg.hxx @@ -70,7 +70,7 @@ class SwContentControlDlg final : public SfxDialogController DECL_LINK(DeleteHdl, weld::Button&, void); DECL_LINK(MoveUpHdl, weld::Button&, void); DECL_LINK(MoveDownHdl, weld::Button&, void); - DECL_LINK(SelectionChangedHdl, weld::TreeView&, void); + DECL_LINK(SelectionChangedHdl, weld::ItemView&, void); DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(SelectCharHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 682af5e69079..b283e95b0474 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -219,7 +219,7 @@ class SwContentTree final : public SfxListener DECL_LINK(CollapseHdl, const weld::TreeIter&, bool); DECL_LINK(ContentDoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(AsyncContentDoubleClickHdl, void*, void); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(CommandHdl, const CommandEvent&, bool); @@ -370,7 +370,7 @@ private: DECL_LINK(Timeout, Timer*, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(FocusInHdl, weld::Widget&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(CommandHdl, const CommandEvent&, bool); diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 80ca19e0bce3..3c7ac7074a0c 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -77,7 +77,7 @@ class SwConvertTableDlg final : public SfxDialogController DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(CheckHdl, weld::Toggleable&, void); - DECL_LINK(SelFormatHdl, weld::TreeView&, void); + DECL_LINK(SelFormatHdl, weld::ItemView&, void); public: SwConvertTableDlg(SwView& rView, bool bToTable); diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index e542f2cc7ff2..8134494146d4 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -132,7 +132,7 @@ class SwInsertDBColAutoPilot final : public SfxDialogController, public utl::Con DECL_LINK( TableFormatHdl, weld::Button&, void ); DECL_LINK( DBFormatHdl, weld::Toggleable&, void ); DECL_LINK( TableToFromHdl, weld::Button&, void ); - DECL_LINK( TVSelectHdl, weld::TreeView&, void ); + DECL_LINK(TVSelectHdl, weld::ItemView&, void); DECL_LINK( CBSelectHdl, weld::ComboBox&, void ); DECL_LINK(DblClickHdl, const weld::TreeIter&, bool); DECL_LINK( HeaderHdl, weld::Toggleable&, void ); diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index 806c0c722a7c..33da94b8a6f3 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -55,7 +55,7 @@ public: void AddDataSource(const OUString& rSource); - void connect_changed(const Link& rLink) + void connect_changed(const Link& rLink) { m_xTreeView->connect_selection_changed(rLink); } diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 8a77f52905c7..ae366798b68a 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -60,7 +60,7 @@ class SwGlossaryGroupDlg final : public SfxDialogController bool IsDeleteAllowed(const OUString& rGroup); void Apply(); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(NewHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 0749a21afcd1..b283d7ebb903 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -86,7 +86,7 @@ class SwGlossaryDlg final : public SfxDialogController DECL_LINK( NameModify, weld::Entry&, void ); DECL_LINK(NameDoubleClick, const weld::TreeIter&, bool); - DECL_LINK( GrpSelect, weld::TreeView&, void ); + DECL_LINK(GrpSelect, weld::ItemView&, void); DECL_LINK( MenuHdl, const OUString&, void ); DECL_LINK( EnableHdl, weld::Toggleable&, void ); DECL_LINK( BibHdl, weld::Button&, void ); diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 59dacf361961..336a6034c756 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -64,7 +64,7 @@ class SwInsTableDlg final : public SfxDialogController void InitAutoTableFormat(); DECL_LINK(TextFilterHdl, OUString&, bool); - DECL_LINK(SelFormatHdl, weld::TreeView&, void); + DECL_LINK(SelFormatHdl, weld::ItemView&, void); DECL_LINK(ModifyName, weld::Entry&, void); DECL_LINK(ModifyRowCol, weld::Entry&, void); DECL_LINK(OKHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index ff09076118dc..23d29a74e1af 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -29,7 +29,7 @@ class SwTOXMgr; // insert mark for index entry class SwMultiTOXMarkDlg final : public weld::GenericDialogController { - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); SwTOXMgr& m_rMgr; sal_uInt16 m_nPos; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 513e1a869362..d0e50bfb7de2 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -78,7 +78,7 @@ class SwNumPositionTabPage final : public SfxTabPage void InitControls(); - DECL_LINK(LevelHdl, weld::TreeView&, void); + DECL_LINK(LevelHdl, weld::ItemView&, void); DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(DistanceHdl, weld::MetricSpinButton&, void); DECL_LINK(RelativeHdl, weld::Toggleable&, void); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index aa850f16ef91..8e3f1b9d2386 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -106,7 +106,7 @@ class SW_DLLPUBLIC SwNumFormatTreeView final : public SwNumFormatBase { std::unique_ptr mxControl; - DECL_DLLPRIVATE_LINK( SelectHdl, weld::TreeView&, void ); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::ItemView&, void); virtual void Init() override; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 67d10b6a9a15..4b7c47e095e0 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -192,7 +192,7 @@ private: DECL_LINK(ModifyEntryHdl, weld::Entry&, void); DECL_LINK(ModifyComboHdl, weld::ComboBox&, void); DECL_LINK(OrderHdl, weld::ComboBox&, void ); - DECL_LINK(ShowEntryHdl, weld::TreeView&, void); + DECL_LINK(ShowEntryHdl, weld::ItemView&, void); DECL_LINK(ToggleEntryHdl, const weld::TreeView::iter_col&, void); DECL_LINK(TextFilterHdl, OUString&, bool); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index f35157ffcf73..5bbc3da18907 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -89,7 +90,7 @@ class SwOutlineSettingsTabPage final : public SfxTabPage std::unique_ptr m_xPreviewWIN; void ApplyLevelSelection(); - DECL_LINK( LevelHdl, weld::TreeView&, void ); + DECL_LINK(LevelHdl, weld::ItemView&, void); DECL_LINK( ToggleComplete, weld::SpinButton&, void ); DECL_LINK( CollSelect, weld::ComboBox&, void ); void CollSave(); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 630924d1d9d9..3b9af4d43943 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -92,7 +92,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg final : public SfxListener DECL_DLLPRIVATE_LINK( RejectHdl, SvxTPView*, void ); DECL_DLLPRIVATE_LINK( RejectAllHdl, SvxTPView*, void ); DECL_DLLPRIVATE_LINK( UndoHdl, SvxTPView*, void ); - DECL_DLLPRIVATE_LINK( SelectHdl, weld::TreeView&, void ); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::ItemView&, void); DECL_DLLPRIVATE_LINK( GotoHdl, Timer*, void ); DECL_DLLPRIVATE_LINK( CommandHdl, const CommandEvent&, bool ); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 1049a2433fb9..181fb0dbeed4 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -45,7 +45,7 @@ class SwCondCollPage final : public SfxTabPage DECL_LINK(AssignRemoveTreeListBoxHdl, const weld::TreeIter&, bool); DECL_LINK(AssignRemoveClickHdl, weld::Button&, void); - DECL_LINK(SelectTreeListBoxHdl, weld::TreeView&, void); + DECL_LINK(SelectTreeListBoxHdl, weld::ItemView&, void); DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void); void AssignRemove(const weld::Widget*); void SelectHdl(const weld::Widget*); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 2084bc421e1f..553c56c6cf18 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -370,7 +370,7 @@ class SwTOXEntryTabPage final : public SfxTabPage DECL_LINK(StyleSelectHdl, weld::ComboBox&, void); DECL_LINK(EditStyleHdl, weld::Button&, void); DECL_LINK(InsertTokenHdl, weld::Button&, void); - DECL_LINK(LevelHdl, weld::TreeView&, void); + DECL_LINK(LevelHdl, weld::ItemView&, void); DECL_LINK(AutoRightHdl, weld::Toggleable&, void); DECL_LINK(TokenSelectedHdl, SwFormToken&, void); DECL_LINK(TabPosHdl, weld::MetricSpinButton&, void); @@ -391,7 +391,7 @@ class SwTOXEntryTabPage final : public SfxTabPage DECL_LINK(ModifyClickHdl, weld::Toggleable&, void); void ShowHideControls(int eType); - void LevelHdlImpl(weld::TreeView& rBox, bool bGrabFocus); + void LevelHdlImpl(weld::ItemView& rBox, bool bGrabFocus); public: SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); @@ -422,7 +422,7 @@ class SwTOXStylesTabPage final : public SfxTabPage DECL_LINK(EditStyleHdl, weld::Button&, void); DECL_LINK(StdHdl, weld::Button&, void); - DECL_LINK(EnableSelectHdl, weld::TreeView&, void); + DECL_LINK(EnableSelectHdl, weld::ItemView&, void); DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); DECL_LINK(AssignHdl, weld::Button&, void); void Modify(); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 02cc0ed690d6..e7b03bdbda6e 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -836,7 +836,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli weld::TreeView& rTreeView = m_pTable->GetWidget(); // because of Bug of TLB that ALWAYS calls the SelectHandler at Remove: - rTreeView.connect_selection_changed(Link()); + rTreeView.connect_selection_changed(Link()); bool bChildrenRemoved = false; rTreeView.thaw(); @@ -1303,7 +1303,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) Init(); } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl, weld::ItemView&, void) { m_aSelectTimer.Start(); } diff --git a/sw/source/uibase/sidebar/QuickFindPanel.cxx b/sw/source/uibase/sidebar/QuickFindPanel.cxx index 3dbc28b6272e..73c949f62ef0 100644 --- a/sw/source/uibase/sidebar/QuickFindPanel.cxx +++ b/sw/source/uibase/sidebar/QuickFindPanel.cxx @@ -434,7 +434,7 @@ IMPL_LINK(QuickFindPanel, SearchFindsListRender, weld::TreeView::render_args, aP } } -IMPL_LINK_NOARG(QuickFindPanel, SearchFindsListSelectionChangedHandler, weld::TreeView&, void) +IMPL_LINK_NOARG(QuickFindPanel, SearchFindsListSelectionChangedHandler, weld::ItemView&, void) { std::unique_ptr xEntry = m_xSearchFindsList->get_cursor(); if (!xEntry) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 9b1fd55e6878..812efd18cc1b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -6772,7 +6772,7 @@ void SwContentTree::ShowActualView() } } -IMPL_LINK_NOARG(SwContentTree, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwContentTree, SelectHdl, weld::ItemView&, void) { if (m_pConfig->IsNavigateOnSelect()) { diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 4043a4b23fe6..b5706645aca7 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -384,7 +384,7 @@ IMPL_LINK(SwGlobalTree, QueryTooltipHdl, const weld::TreeIter&, rIter, OUString) return sEntry; } -IMPL_LINK_NOARG(SwGlobalTree, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwGlobalTree, SelectHdl, weld::ItemView&, void) { Select(); } diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 9a22b039666b..663b2913d7c8 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -57,7 +57,7 @@ class SwGlossDecideDlg : public weld::GenericDialogController std::unique_ptr m_xListLB; DECL_LINK(DoubleClickHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); public: explicit SwGlossDecideDlg(weld::Window* pParent); @@ -84,7 +84,7 @@ IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl, const weld::TreeIter&, bool) return true; } -IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl, weld::ItemView&, void) { m_xOk->set_sensitive(m_xListLB->get_selected_index() != -1); } diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index b51a20563b93..81ceb0fb046f 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -441,7 +441,7 @@ IMPL_LINK_NOARG(NumFormatListBox, SelectHdl, weld::ComboBox&, void) CallSelectHdl(); } -IMPL_LINK_NOARG(SwNumFormatTreeView, SelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(SwNumFormatTreeView, SelectHdl, weld::ItemView&, void) { CallSelectHdl(); } diff --git a/vcl/source/weld/EntryTreeView.cxx b/vcl/source/weld/EntryTreeView.cxx index 282ec0fe4aeb..1050a27dfea4 100644 --- a/vcl/source/weld/EntryTreeView.cxx +++ b/vcl/source/weld/EntryTreeView.cxx @@ -19,7 +19,7 @@ EntryTreeView::EntryTreeView(std::unique_ptr xEntry, std::unique_ptrconnect_changed(LINK(this, EntryTreeView, ModifyHdl)); } -IMPL_LINK(EntryTreeView, ClickHdl, weld::TreeView&, rView, void) +IMPL_LINK(EntryTreeView, ClickHdl, weld::ItemView&, rView, void) { m_xEntry->set_text(rView.get_selected_text()); m_aChangeHdl.Call(*this); diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 5ff8353673ee..185e398787b6 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -371,7 +371,7 @@ IMPL_LINK(RTSDevicePage, ModifyHdl, weld::Entry&, rEdit, void) } } -IMPL_LINK( RTSDevicePage, SelectHdl, weld::TreeView&, rBox, void ) +IMPL_LINK(RTSDevicePage, SelectHdl, weld::ItemView&, rBox, void) { if (&rBox == m_xPPDKeyBox.get()) { diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 950f7675a783..77eefbbb31f7 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -123,7 +123,7 @@ private: Idle m_aReselectCustomIdle; - DECL_LINK(SelectHdl, weld::TreeView&, void); + DECL_LINK(SelectHdl, weld::ItemView&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); DECL_LINK(ComboChangedHdl, weld::ComboBox&, void); DECL_LINK(ImplHandleReselectHdl, Timer*, void); diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index d96e2a33d77c..cfab15cfd0ca 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -80,7 +80,7 @@ private: DECL_LINK(ReloadButtonHdl, weld::Button&, void); DECL_LINK(ViewButtonHdl, weld::Button&, void); - DECL_LINK(CertificateHighlightHdl, weld::TreeView&, void); + DECL_LINK(CertificateHighlightHdl, weld::ItemView&, void); DECL_LINK(CertificateSelectHdl, const weld::TreeIter&, bool); DECL_LINK(SearchModifyHdl, weld::Entry&, void); diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index 84fbf091296e..4065172be225 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -115,7 +115,7 @@ private: std::unique_ptr m_xElementsLB; std::unique_ptr m_xValueDetails; - DECL_LINK(ElementSelectHdl, weld::TreeView&, void); + DECL_LINK(ElementSelectHdl, weld::ItemView&, void); void InsertElement(const OUString& rField, const OUString& rValue, const OUString& rDetails, bool bFixedWidthFont = false); public: @@ -151,7 +151,7 @@ private: std::unique_ptr mxCertNotValidated; DECL_LINK(ViewCertHdl, weld::Button&, void); - DECL_LINK(CertSelectHdl, weld::TreeView&, void); + DECL_LINK(CertSelectHdl, weld::ItemView&, void); void InsertCert(const weld::TreeIter* pParent, const OUString& _rName, const css::uno::Reference< css::security::XCertificate >& rxCert, bool bValid); diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index df3ba5a815e8..c06f9025eaae 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -77,7 +77,7 @@ private: DECL_LINK(AddButtonHdl, weld::Button&, void); void AddButtonHdlImpl(); DECL_LINK(RemoveButtonHdl, weld::Button&, void); - DECL_LINK(SignatureHighlightHdl, weld::TreeView&, void); + DECL_LINK(SignatureHighlightHdl, weld::ItemView&, void); DECL_LINK(SignatureSelectHdl, const weld::TreeIter&, bool); DECL_LINK(StartVerifySignatureHdl, LinkParamNone*, bool); DECL_LINK(OKButtonHdl, weld::Button&, void); diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index ff87ee202909..4e541f867e48 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -120,8 +120,8 @@ private: DECL_LINK(RemoveCertPBHdl, weld::Button&, void); DECL_LINK(AddLocPBHdl, weld::Button&, void); DECL_LINK(RemoveLocPBHdl, weld::Button&, void); - DECL_LINK(TrustCertLBSelectHdl, weld::TreeView&, void); - DECL_LINK(TrustFileLocLBSelectHdl, weld::TreeView&, void); + DECL_LINK(TrustCertLBSelectHdl, weld::ItemView&, void); + DECL_LINK(TrustFileLocLBSelectHdl, weld::ItemView&, void); void FillCertLB(const bool bShowWarnings = false); void ImplCheckButtons(); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index c37898064c8e..25f9ab2996e7 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -420,7 +420,7 @@ IMPL_LINK_NOARG(CertificateChooser, SearchModifyHdl, weld::Entry&, void) ImplInitialize(true); } -IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl, weld::ItemView&, void) { bool bEnable = m_xCertLB->get_selected_index() != -1; m_xViewBtn->set_sensitive(bEnable); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 72197690c54c..5ceb01a9782f 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -241,7 +241,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP(weld::Container* pParent, LINK(this, CertificateViewerDetailsTP, ElementSelectHdl)); } -IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl, weld::ItemView&, void) { int nEntry = m_xElementsLB->get_selected_index(); OUString aElementText; @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl, weld::Button&, void) } } -IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl, weld::ItemView&, void) { OUString sStatus; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 053d2753e16c..9df6c78c50f0 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -456,7 +456,7 @@ short DigitalSignaturesDialog::run() return GenericDialogController::run(); } -IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, weld::ItemView&, void) { bool bSel = m_xSignaturesLB->get_selected_index() != -1; m_xViewBtn->set_sensitive( bSel ); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index c5df5b706eaa..852b86fd673c 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -354,12 +354,12 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, weld::Button&, vo ImplCheckButtons(); } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, weld::ItemView&, void) { ImplCheckButtons(); } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, weld::TreeView&, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, weld::ItemView&, void) { ImplCheckButtons(); }