[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf788fcf0789881b59f59fe19dbeea5491a7b2dd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 16 08:54:45 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 29 09:20:32 2019 +0200

    Resolves: tdf#126951 crash in custom slide show
    
    on selecting entry 0 which doesn't exist
    
    Change-Id: I67656bed63f9055bc6c5dd5781e79f967996500d
    Reviewed-on: https://gerrit.libreoffice.org/77560
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 5d3e9ababc0b3e049a7556b210bb6349e3e3322c)
    Reviewed-on: https://gerrit.libreoffice.org/77696
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/77920
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 88e1b1da61e1..dd3a7f26bbe0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2073,7 +2073,7 @@ public:
     {
         assert(m_xTreeView->IsUpdateMode() && "don't select when frozen");
         disable_notify_events();
-        if (pos == -1)
+        if (pos == -1 || (pos == 0 && n_children() == 0))
             m_xTreeView->SelectAll(false);
         else
         {