[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bdef7bbcd9e51f1272b006962c17ca0b2493205a
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Dec 20 14:52:40 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 17 13:53:56 2023 +0000

    tdf#150823 sw: merge delete redlines in same paragraph
    
    The problematic merge was with a redline that spanned multiple nodes.
    
    (regression from commit 7d730cd580e957ab06b0c7f020ac37dd0c337aa2)
    
    Change-Id: Ie3fd23d102056b45833314143ec6381c1e9ef373
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144615
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 5cd8ea4d8a4fa8c5ac8e28be8fbc240caf070ff4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144624
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 0a1076db29f4..caa1e97b0297 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1679,7 +1679,8 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
                     break;
 
                 case SwComparePosition::CollideEnd:
-                    if (pRStt->nContent != 0)
+                    if (pRStt->nContent != 0
+                        && pRStt->nNode != pREnd->nNode)
                     {   // tdf#147466 HACK: don't combine in this case to 
avoid the tdf#119571 code from *undeleting* section nodes
                         break;
                     }