commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a
author Noel Grandin <noel.grandin@collabora.co.uk> Thu Sep 03 14:40:32 2020 +0200
committer Caolán McNamara <caolanm@redhat.com> Sun Sep 06 13:28:54 2020 +0200
tree 58652e98597bfa1adb03ef212cb0c2bcaf1c83d3
parent d96ca67b22e3b42cf79637d3f6497d02a9f48656

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.lauhakangas@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
(cherry picked from commit 18e4367c33f327cf09985105bde583cdcc7b2a46)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101972
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/source/core/txtnode/thints.cxx

diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 51b3edd..711e29d 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;