[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Noel Grandin (via logerrit)]

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

New commits:
commit 48cf4c412cc4ddeccf1d21a81b3b4859b6a79459
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 3 14:40:32 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Sep 29 17:29:14 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>
    (cherry picked from commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103581
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index b46c3ea7ae05..5b363f2d9119 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2821,6 +2821,8 @@ bool SwpHints::MergePortions( SwTextNode& rNode )
                                 eMerge = DIFFER;
                                 break;
                             }
+                            if (iter1.IsAtEnd() && iter2.IsAtEnd())
+                                break;
                             if (iter1.IsAtEnd() || iter2.IsAtEnd())
                             {
                                 eMerge = DIFFER;