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

[Michael Stahl (via logerrit)]

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

New commits:
commit 0644c90edb4ccb1395c3b78668acc32d857b4d91
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Dec 20 14:52:40 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Dec 20 18:52:15 2022 +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/+/144608

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