sw/source/core/txtnode/thints.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 988acfabb22ec9281c0fe70ed40b574eeceae90b
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: Mon Jul 12 20:20:41 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118765
Tested-by: Jenkins
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index bc49210e14f0..10538457d94f 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2846,7 +2846,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
