sw/source/core/txtnode/thints.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 18e4367c33f327cf09985105bde583cdcc7b2a46 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Sep 3 14:40:32 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Sep 3 15:41:01 2020 +0200 tdf#132688 diacritics broken in lines with punctuation regression from commit 4b2d4f3c4a68361a6bc03c9ab110ce9376b14b20 tdf#119227 fix freeze when copying a large bulleted list Change-Id: I7d54b19c7a02c717426edce7896caaadf909154e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102000 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 9d72b113b1f4..b7e115e34054 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2822,6 +2822,8 @@ bool SwpHints::MergePortions( SwTextNode& rNode ) eMerge = DIFFER; break; } + if (iter1.IsAtEnd() && iter2.IsAtEnd()) + break; if (iter1.IsAtEnd() || iter2.IsAtEnd()) { eMerge = DIFFER; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits