diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-22 10:10:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-22 14:24:07 +0100 |
| commit | 5a54f79b4262cd481bcf2f02d7f50b07ecafdef4 (patch) | |
| tree | c0c2efcf1fb3d7632eaa9ba8dba79ad96e3307fd /sw | |
| parent | b659939fc3badd44e234c6bd5e12873619fd403a (diff) | |
Resolves: rhbz#1775544 crash in navigator
see demo reproducer in rhbz#1775544 nChildCount is a count of all
descendants not just direct children.
Just looping while FirstChild returns something is sufficient.
Change-Id: If7b16032731d694bfffaae22faad5fe194d1822f
Reviewed-on: https://gerrit.libreoffice.org/83456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 7590e77180ad..880e1df23ce8 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2218,12 +2218,8 @@ bool SwContentTree::HasContentChanged() } if(bRemoveChildren) { - for(size_t j = 0; j < nChildCount; ++j) - { - SvTreeListEntry *const pRemove = FirstChild(pEntry); - assert(pRemove); - GetModel()->Remove(pRemove); - } + while (SvTreeListEntry *const pRemove = FirstChild(pEntry)) + RemoveEntry(pRemove); } if(!nChildCount) { |