summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Heinisch <andreas.heinisch@yahoo.de>2021-07-05 22:32:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-06 10:18:42 +0200
commit003d65ef1305eefb43315f93bdf10cee787f90f0 (patch)
tree049c8b2904fbdbffc33ed027a54d682b647c8fba
parent2779e669fd54695ace5a9425280d1efca93729b6 (diff)
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.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sw/source/core/txtnode/thints.cxx2
1 files changed, 1 insertions, 1 deletions
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;
}
}