commit 36bc901426163aa38b551865d3dd57a3a3423910
author Noel Grandin <noelgrandin@gmail.com> Sat Mar 13 18:12:24 2021 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Thu Mar 18 12:31:11 2021 +0100
tree 645d8304e4c85f5921e0c7cc8469df6cd91451fd
parent d652495a0f5626ba02369289c0ad2cb341f9015d

tdf#140590 Writer crash in Tools>Chapter Numbering

and an assert in vcl to catch it a little higher up the stack.

Change-Id: Iaa2e70f901f93ca9f678118e4f5a8bc1b6eda20a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112459
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sw/source/ui/misc/outline.cxx

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index d9cc011..9b65b57 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -92,7 +92,7 @@
                nSelect++;
        }
    }
    m_xFormBox->select(nSelect);
    m_xFormBox->select(std::min(nSelect, static_cast<sal_uInt16>(m_xFormBox->n_children() - 1)));
    SelectHdl(*m_xFormBox);
}

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7d309a7..9d47a3e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3942,6 +3942,7 @@
    else
    {
        SvTreeListEntry* pEntry = m_xTreeView->GetEntry(nullptr, pos);
        assert(pEntry && "bad pos?");
        m_xTreeView->Select(pEntry, true);
        m_xTreeView->MakeVisible(pEntry);
    }