[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/txtnode/thints.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 3 14:40:32 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 6 13:28:54 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.lauhakangas at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at 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 at redhat.com>

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