| commit | 04692e1898448d2344bab67f9e7b2f32198d4411 | [log] |
|---|---|---|
| author | Noel Grandin <noel.grandin@collabora.co.uk> | Thu Sep 03 14:40:32 2020 +0200 |
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | Wed Sep 30 20:27:59 2020 +0200 |
| tree | ddef64ac82fa7d49b644b24e0ff318107874154a | |
| parent | f58f5607d902a4e24a9af80ea1b23b84f658e20c [diff] |
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> (cherry picked from commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103581 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 48cf4c412cc4ddeccf1d21a81b3b4859b6a79459) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103587 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index b46c3ea..5b363f2 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;