summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-03-13 18:12:24 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-03-26 14:23:51 +0100
commite826753132ccd77f7bdcc096712d577f42911968 (patch)
treebb5daa6f5856e7966a08f616c6d58961a22d8e50
parentupdate credits (diff)
downloadcore-e826753132ccd77f7bdcc096712d577f42911968.tar.gz
core-e826753132ccd77f7bdcc096712d577f42911968.zip
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> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112866 (cherry picked from commit ebbf550f7087b173bdcf600a02bb87c0b655e787) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113124
-rw-r--r--sw/source/ui/misc/outline.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 8a62e03054ea..3ad4e369bd75 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -92,7 +92,7 @@ void SwNumNamesDlg::SetUserNames(const OUString *pList[])
nSelect++;
}
}
- m_xFormBox->select(nSelect);
+ m_xFormBox->select(std::min(nSelect, static_cast<sal_uInt16>(m_xFormBox->n_children() - 1)));
SelectHdl(*m_xFormBox);
}