core.git: 3 commits - vcl/inc vcl/qt5

[Michael Weghorn (via logerrit)]

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

New commits:
commit 24eded86bc205fbf9d785400a1c4cef64ff6ebf4
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 20 23:20:28 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Feb 21 08:43:36 2025 +0100

    tdf#130857 qt weld: Implement QtInstanceTreeView::count_selected_rows
    
    Change-Id: I57b2b8230119c823ca475d7306c370f8ea57d8ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181975
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/vcl/qt5/QtInstanceTreeView.cxx b/vcl/qt5/QtInstanceTreeView.cxx
index 39ac8fe3d1dc..cba135b5421e 100644
--- a/vcl/qt5/QtInstanceTreeView.cxx
+++ b/vcl/qt5/QtInstanceTreeView.cxx
@@ -782,11 +782,7 @@ void QtInstanceTreeView::set_selection_mode(SelectionMode 
eMode)
         [&] { m_pTreeView->setSelectionMode(mapSelectionMode(eMode)); });
 }
 
-int QtInstanceTreeView::count_selected_rows() const
-{
-    assert(false && "Not implemented yet");
-    return 0;
-}
+int QtInstanceTreeView::count_selected_rows() const { return 
get_selected_rows().size(); }
 
 void QtInstanceTreeView::remove_selection() { assert(false && "Not implemented 
yet"); }
 
commit 6b77cbba6b577477c75712608381dec596dcd8fb
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 20 23:04:37 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Feb 21 08:43:30 2025 +0100

    tdf#130857 qt weld: Forward more TreeView methods taking iter
    
    ... to their equivalents taking a row index.
    
    Change-Id: I1e61f2931a6c10e1d220f0377ffa937a3f69abfb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181974
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/qt5/QtInstanceTreeView.cxx b/vcl/qt5/QtInstanceTreeView.cxx
index 1f83d28f5dfb..39ac8fe3d1dc 100644
--- a/vcl/qt5/QtInstanceTreeView.cxx
+++ b/vcl/qt5/QtInstanceTreeView.cxx
@@ -484,11 +484,11 @@ int QtInstanceTreeView::iter_n_children(const 
weld::TreeIter&) const
     return -1;
 }
 
-void QtInstanceTreeView::remove(const weld::TreeIter&) { assert(false && "Not 
implemented yet"); }
+void QtInstanceTreeView::remove(const weld::TreeIter& rIter) { 
remove(rowIndex(rIter)); }
 
-void QtInstanceTreeView::select(const weld::TreeIter&) { assert(false && "Not 
implemented yet"); }
+void QtInstanceTreeView::select(const weld::TreeIter& rIter) { 
select(rowIndex(rIter)); }
 
-void QtInstanceTreeView::unselect(const weld::TreeIter&) { assert(false && 
"Not implemented yet"); }
+void QtInstanceTreeView::unselect(const weld::TreeIter& rIter) { 
unselect(rowIndex(rIter)); }
 
 void QtInstanceTreeView::set_extra_row_indent(const weld::TreeIter&, int)
 {
@@ -580,10 +580,9 @@ void QtInstanceTreeView::scroll_to_row(const 
weld::TreeIter& rIter)
     scroll_to_row(rowIndex(rIter));
 }
 
-bool QtInstanceTreeView::is_selected(const weld::TreeIter&) const
+bool QtInstanceTreeView::is_selected(const weld::TreeIter& rIter) const
 {
-    assert(false && "Not implemented yet");
-    return false;
+    return is_selected(rowIndex(rIter));
 }
 
 void QtInstanceTreeView::move_subtree(weld::TreeIter&, const weld::TreeIter*, 
int)
commit 01c88fcab34df9b796bfa1105c333ab21dc1df72
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 20 22:59:44 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Feb 21 08:43:23 2025 +0100

    tdf#130857 qt weld: Implement QtInstanceTreeView::is_selected
    
    Change-Id: Id86fac8f3f6c2ff06f3b480ccc4fa7ef4a25cbf5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181973
    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 91d70762a837..b72e9fe27909 100644
--- a/vcl/inc/qt5/QtInstanceTreeView.hxx
+++ b/vcl/inc/qt5/QtInstanceTreeView.hxx
@@ -61,7 +61,7 @@ public:
     virtual std::vector<int> get_selected_rows() const override;
     virtual void set_font_color(int pos, const Color& rColor) override;
     virtual void scroll_to_row(int nRow) override;
-    virtual bool is_selected(int pos) const override;
+    virtual bool is_selected(int nPos) const override;
     virtual int get_cursor_index() const override;
     virtual void set_cursor(int pos) override;
 
diff --git a/vcl/qt5/QtInstanceTreeView.cxx b/vcl/qt5/QtInstanceTreeView.cxx
index 024a63c3cbba..1f83d28f5dfb 100644
--- a/vcl/qt5/QtInstanceTreeView.cxx
+++ b/vcl/qt5/QtInstanceTreeView.cxx
@@ -292,10 +292,14 @@ void QtInstanceTreeView::scroll_to_row(int nRow)
     GetQtInstance().RunInMainThread([&] { 
m_pTreeView->scrollTo(modelIndex(nRow)); });
 }
 
-bool QtInstanceTreeView::is_selected(int) const
+bool QtInstanceTreeView::is_selected(int nPos) const
 {
-    assert(false && "Not implemented yet");
-    return false;
+    SolarMutexGuard g;
+
+    bool bSelected = false;
+    GetQtInstance().RunInMainThread([&] { bSelected = 
m_pSelectionModel->isRowSelected(nPos); });
+
+    return bSelected;
 }
 
 int QtInstanceTreeView::get_cursor_index() const