summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-10-14 15:21:24 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-10-14 16:39:23 +0200
commit48a76ea268b4c7fe499abe858074420dd7b152e2 (patch)
tree67036b249758ec8a0fa6c02babd76aa064a8f109
parentf4f67aa5f1e062ee4376a28293cad15a154bfb5b (diff)
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@cib.de> Tested-by: Jenkins
-rw-r--r--sw/source/core/table/swnewtable.cxx2
1 files changed, 1 insertions, 1 deletions
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);