sw/source/core/txtnode/thints.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 003d65ef1305eefb43315f93bdf10cee787f90f0 Author: Andreas Heinisch <andreas.heini...@yahoo.de> AuthorDate: Mon Jul 5 22:32:52 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jul 6 10:18:42 2021 +0200 tdf#140197 - Letter cut off at certain zoom-level regression from commit 4b2d4f3c4a68361a6bc03c9ab110ce9376b14b20 tdf#119227 fix freeze when copying a large bulleted list Change-Id: Ib69af488fcd30553b4aa4fd3f4b35b5a08d67adc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118455 Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index acf8ba4b9eeb..7d637f896945 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2785,7 +2785,7 @@ bool SwpHints::MergePortions( SwTextNode& rNode ) break; if (iter1.IsAtEnd() || iter2.IsAtEnd()) { - eMerge = DIFFER; + eMerge = DIFFER_ONLY_RSID; break; } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits