vcl/unx/gtk3/gtkinst.cxx | 68 +++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 46 deletions(-)
New commits: commit 0d4bed8ef809c0a9d88cb3f270b7bf70c484248a Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 23 11:14:51 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 23 22:03:57 2026 +0100 gtk weld: Deduplicate weld::ItemView::iter_next_sibling impls GtkInstanceTreeView and GtkInstanceIconView implement the same logic. Deduplicate by moving it to the shared GtkInstanceItemView base class. Change-Id: Iacc5e970626ea1d043e520faebc18de4a1fbc17c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197932 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index eba569c26762..12dfbdc7eed5 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -13909,6 +13909,17 @@ public: return true; } + virtual bool iter_next_sibling(weld::TreeIter& rIter) const override + { + GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); + GtkTreeIter aTmpIter = rGtkIter.iter; + if (!gtk_tree_model_iter_next(m_pTreeModel, &aTmpIter)) + return false; + + rGtkIter.iter = aTmpIter; + return true; + } + virtual std::unique_ptr<weld::TreeIter> get_iterator(int nPos) const override { GtkTreeIter iter; @@ -15594,17 +15605,6 @@ public: enable_notify_events(); } - virtual bool iter_next_sibling(weld::TreeIter& rIter) const override - { - GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); - GtkTreeIter aTmpIter = rGtkIter.iter; - if (!gtk_tree_model_iter_next(m_pTreeModel, &aTmpIter)) - return false; - - rGtkIter.iter = aTmpIter; - return true; - } - virtual bool iter_previous_sibling(weld::TreeIter& rIter) const override { GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); @@ -16865,18 +16865,6 @@ public: enable_notify_events(); } - virtual bool iter_next_sibling(weld::TreeIter& rIter) const override - { - GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); - GtkTreeModel* pModel = GTK_TREE_MODEL(m_pTreeStore); - GtkTreeIter aTmpIter = rGtkIter.iter; - if (!gtk_tree_model_iter_next(pModel, &aTmpIter)) - return false; - - rGtkIter.iter = aTmpIter; - return true; - } - virtual int get_iter_index_in_parent(const weld::TreeIter& rIter) const override { const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter); commit 0f890775ccdecdb74f0a8de2784b793960a996be Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 23 11:13:19 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 23 22:03:50 2026 +0100 gtk weld: Deduplicate weld::ItemView::get_iter_first impls GtkInstanceTreeView and GtkInstanceIconView implement the same logic. Deduplicate by moving it to the shared GtkInstanceItemView base class. Change-Id: I31fc950e8c981db202feead686b03d9707862228 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197931 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 4421fbba6654..eba569c26762 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -13898,6 +13898,17 @@ public: new GtkInstanceTreeIter(static_cast<const GtkInstanceTreeIter*>(pOrig))); } + virtual bool get_iter_first(weld::TreeIter& rIter) const override + { + GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); + GtkTreeIter aFirstIter; + if (!gtk_tree_model_get_iter_first(m_pTreeModel, &aFirstIter)) + return false; + + rGtkIter.iter = aFirstIter; + return true; + } + virtual std::unique_ptr<weld::TreeIter> get_iterator(int nPos) const override { GtkTreeIter iter; @@ -15583,17 +15594,6 @@ public: enable_notify_events(); } - virtual bool get_iter_first(weld::TreeIter& rIter) const override - { - GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); - GtkTreeIter aFirstIter; - if (!gtk_tree_model_get_iter_first(m_pTreeModel, &aFirstIter)) - return false; - - rGtkIter.iter = aFirstIter; - return true; - } - virtual bool iter_next_sibling(weld::TreeIter& rIter) const override { GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); @@ -16865,18 +16865,6 @@ public: enable_notify_events(); } - virtual bool get_iter_first(weld::TreeIter& rIter) const override - { - GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); - GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore); - GtkTreeIter aFirstIter; - if (!gtk_tree_model_get_iter_first(pModel, &aFirstIter)) - return false; - - rGtkIter.iter = aFirstIter; - return true; - } - virtual bool iter_next_sibling(weld::TreeIter& rIter) const override { GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter);
