sw/source/core/txtnode/ndtxt.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a64511dc929a91926ade0c132b310214fdb1bdea
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Aug 25 17:30:16 2020 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Aug 25 19:59:41 2020 +0200
tdf#135018 sw_redlinehide: fix accept delete redline at start of body
There is no predecessor text node.
(regression from 34b32f56e7f76639ee3a31cfc230a3340acf635a)
Change-Id: I5f6a1a7a1a35a2a6e600166dc1afcf6c4bf9d389
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101337
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 1dd213960885..57a605f41098 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -871,7 +871,10 @@ void CheckResetRedlineMergeFlag(SwTextNode & rNode,
Recreate const eRecreateMerg
if (eRecreateMerged != sw::Recreate::No)
{
SwTextNode * pMergeNode(&rNode);
- if (eRecreateMerged == sw::Recreate::Predecessor)
+ if (eRecreateMerged == sw::Recreate::Predecessor
+ // tdf#135018 check that there is a predecessor node, i.e. rNode
+ // isn't the first node after the body start node
+ && rNode.GetNodes()[rNode.GetIndex() - 1]->StartOfSectionIndex()
!= 0)
{
for (sal_uLong i = rNode.GetIndex() - 1; ; --i)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
