summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorAttila Szűcs <attila.szucs@collabora.com>2023-10-26 01:51:40 +0200
committerCaolán McNamara <caolan.mcnamara@collabora.com>2023-10-30 01:55:54 +0100
commitb40e469887d973e1eea242749a90c3c2370da3a5 (patch)
tree0ad8d7102a1841d3a453cb5ea702ed04ba7ac865 /sw/inc
parent5e726afaf08c8cc59124d9551bb083220a38821e (diff)
tdf#157663 SW: fix redline continueing a move
Subsequent moves generated new MoveID's, like if they were separete moves. That cause moves to forgot their other parts. Now, if we move a redline that was moved by us it will re-use its moveID as if it was just the continue of the previous movement. It does not work if we move more then 1 of our own movement redlines Note: There are complex cases what it cannot handle.. in those case it just use the new ID, so the newly moved part, will forgot its relation with the old move oroginal parts. Complex case is like.. if we move 2 of our own move redlines, that means there will be 2 MoveId we would want to continue, but only 1 insert redline to write that MoveID. But as long as we moved only 1 of our redlines it will work, even if there are more text redlines, even move redlines of other author. Other move redlines will be separate move anyway. Note2: In complex cases, we may could connect movements. Or we could split the new inserted move part. but those are design questions, they may be not good idea.. and the split one is probably more work to implement. Change-Id: Icb2adf43272181c6a63a4a84750352f4b163383a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158473 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158615 Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 6e28f1340deb..9d97eb43ff7e 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -147,7 +147,8 @@ public:
MERGED if pNewRedl was deleted but has been merged with existing one
IGNORED if pNewRedl was deleted and ignored/invalid
*/
- virtual AppendResult AppendRedline(/*[in]*/SwRangeRedline* pNewRedl, /*[in]*/bool bCallDelete) = 0;
+ virtual AppendResult AppendRedline(/*[in]*/ SwRangeRedline* pNewRedl, /*[in]*/ bool bCallDelete,
+ /*[in]*/ sal_uInt32 nMoveIDToDelete = 0) = 0;
virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr) = 0;
virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr) = 0;