[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit ff8288b98f6975c7fc9f36155d26a44e8c625f94
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 15 16:32:50 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 15 20:13:25 2020 +0200

    tdf#126828 skip "on-demand" entries
    
    Change-Id: I5a1b20ce2e6c1d228760fc39e7770e1b497bd9ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92306
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 070958751aed..f21de3229b21 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -9423,6 +9423,9 @@ private:
         if (gtk_tree_model_iter_next(pModel, &tmp))
         {
             rGtkIter.iter = tmp;
+            //on-demand dummy entry doesn't count
+            if (get_text(rGtkIter, -1) == "<dummy>")
+                return iter_next(rGtkIter, bOnlyExpanded);
             return true;
         }
         // Move up level(s) until we find the level where the next node exists.
@@ -9432,6 +9435,9 @@ private:
             if (gtk_tree_model_iter_next(pModel, &tmp))
             {
                 rGtkIter.iter = tmp;
+                //on-demand dummy entry doesn't count
+                if (get_text(rGtkIter, -1) == "<dummy>")
+                    return iter_next(rGtkIter, bOnlyExpanded);
                 return true;
             }
         }