[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx          |    3 +++
 vcl/source/app/salvtables.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 13f449221e550c84bb60c368b2520148104e6da9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 9 09:42:56 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 9 11:50:43 2019 +0200

    n_children is count of toplevel nodes
    
    Change-Id: I38302045bfe096781ce9c59c6f2dbe0a7625efda
    Reviewed-on: https://gerrit.libreoffice.org/70453
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 1529abe9a31b..4b2c759628b9 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -732,15 +732,18 @@ public:
     void select_all() { unselect(-1); }
     void unselect_all() { select(-1); }
 
+    // return the number of toplevel nodes
     virtual int n_children() const = 0;
 
     virtual void make_sorted() = 0;
     virtual void make_unsorted() = 0;
     virtual bool get_sort_order() const = 0;
     virtual void set_sort_order(bool bAscending) = 0;
+
     // TRUE ascending, FALSE, descending, INDET, neither (off)
     virtual void set_sort_indicator(TriState eState, int nColumn = -1) = 0;
     virtual TriState get_sort_indicator(int nColumn = -1) const = 0;
+
     virtual int get_sort_column() const = 0;
     virtual void set_sort_column(int nColumn) = 0;
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 361b8d7830a7..47ab9beab90a 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2558,7 +2558,7 @@ public:
 
     virtual int n_children() const override
     {
-        return m_xTreeView->GetEntryCount();
+        return m_xTreeView->GetModel()->GetChildList(nullptr).size();
     }
 
     virtual void select(int pos) override