[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/table/swnewtable.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48a76ea268b4c7fe499abe858074420dd7b152e2
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Oct 14 15:21:24 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Oct 14 16:39:23 2020 +0200

    sw: fix unsorted redlines in SwTable::ConvertSubtableBox()
    
    ooo12626-10.odt asserts because MoveNodeRange() handles redlines only
    with an explicit flag.
    
    (regression from e366c928819c44b5c253c45dca6dae40b71c9808)
    
    Change-Id: I80c6e696e51c6d9c366af30ecf8b6df265d0fc91
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104286
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins

diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 0b284e573671..2f2a484c645b 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2214,7 +2214,7 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox)
 #if 0
                     pDoc->GetNodes().MoveNodes(content, pDoc->GetNodes(), insPos, false);
 #else
-                    pDoc->getIDocumentContentOperations().MoveNodeRange(content, insPos, SwMoveFlags::NO_DELFRMS);
+                    pDoc->getIDocumentContentOperations().MoveNodeRange(content, insPos, SwMoveFlags::NO_DELFRMS|SwMoveFlags::REDLINES);
 #endif
                     // delete the empty node that was bundled in the new box
                     pDoc->GetNodes().Delete(insPos);