core.git: vcl/inc vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/inc/qt5/QtInstanceTreeView.hxx |    1 -
 vcl/qt5/QtInstanceTreeView.cxx     |   30 ++++++++++++++----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit f25a1d52e0086bf5019c0cd24df49753d7297ba4
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 12 22:19:22 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 13 08:51:37 2025 +0100

    tdf#130857 qt weld: Simplify QtInstanceTreeView::get_id
    
    Drop the extra helper method that takes a QModelIndex
    and let the variant that takes a weld::TreeIter& param
    forward to the one that takes an int for the row index
    instead.
    
    This aligns it with the approach described in previous
    commit
    
        Change-Id: I9cb958bedce1b8926a10bc42dad032cc5f689989
        Author: Michael Weghorn <m.wegh...@posteo.de>
        Date:   Wed Feb 12 22:11:40 2025 +0100
    
            tdf#130857 qt weld: Unify/deduplicate the 2 
QtInstanceTreeview::set_text
    
    Change-Id: I23c41c56bbc175d86ad483402fb904ac744bba0b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181515
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/vcl/inc/qt5/QtInstanceTreeView.hxx 
b/vcl/inc/qt5/QtInstanceTreeView.hxx
index 56bb10717cc4..bef4ffa04dcd 100644
--- a/vcl/inc/qt5/QtInstanceTreeView.hxx
+++ b/vcl/inc/qt5/QtInstanceTreeView.hxx
@@ -189,7 +189,6 @@ private:
     QModelIndex modelIndex(int nRow, int nCol = 0) const;
     QModelIndex modelIndex(const weld::TreeIter& rIter, int nCol = 0) const;
     static int rowIndex(const weld::TreeIter& rIter);
-    OUString get_id(const QModelIndex& rModelIndex) const;
     static QAbstractItemView::SelectionMode mapSelectionMode(SelectionMode 
eMode);
 
 private Q_SLOTS:
diff --git a/vcl/qt5/QtInstanceTreeView.cxx b/vcl/qt5/QtInstanceTreeView.cxx
index 65575f807ce1..167100e6c148 100644
--- a/vcl/qt5/QtInstanceTreeView.cxx
+++ b/vcl/qt5/QtInstanceTreeView.cxx
@@ -316,7 +316,19 @@ int QtInstanceTreeView::find_text(const OUString& rText) 
const
     return nIndex;
 }
 
-OUString QtInstanceTreeView::get_id(int nPos) const { return 
get_id(modelIndex(nPos)); }
+OUString QtInstanceTreeView::get_id(int nPos) const
+{
+    SolarMutexGuard g;
+
+    OUString sId;
+    GetQtInstance().RunInMainThread([&] {
+        QVariant aRoleData = m_pModel->data(modelIndex(nPos), ROLE_ID);
+        if (aRoleData.canConvert<QString>())
+            sId = toOUString(aRoleData.toString());
+    });
+
+    return sId;
+}
 
 int QtInstanceTreeView::find_id(const OUString& rId) const
 {
@@ -520,7 +532,7 @@ void QtInstanceTreeView::set_id(const weld::TreeIter& 
rIter, const OUString& rId
 
 OUString QtInstanceTreeView::get_id(const weld::TreeIter& rIter) const
 {
-    return get_id(modelIndex(rIter));
+    return get_id(rowIndex(rIter));
 }
 
 void QtInstanceTreeView::set_image(const weld::TreeIter& rIter, const 
OUString& rImage, int nCol)
@@ -845,20 +857,6 @@ int QtInstanceTreeView::rowIndex(const weld::TreeIter& 
rIter)
     return aModelIndex.row();
 }
 
-OUString QtInstanceTreeView::get_id(const QModelIndex& rModelIndex) const
-{
-    SolarMutexGuard g;
-
-    OUString sId;
-    GetQtInstance().RunInMainThread([&] {
-        QVariant aRoleData = m_pModel->data(rModelIndex, ROLE_ID);
-        if (aRoleData.canConvert<QString>())
-            sId = toOUString(aRoleData.toString());
-    });
-
-    return sId;
-}
-
 void QtInstanceTreeView::handleActivated()
 {
     SolarMutexGuard g;