summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorAttila Szűcs <attila.szucs@collabora.com>2023-08-28 07:40:20 +0200
committerCaolán McNamara <caolan.mcnamara@collabora.com>2023-10-14 11:55:27 +0200
commit52fa7aed48632166e064e6a227e034f0981c4205 (patch)
tree7980950d1b52c59f142a8b6f23f378acba0c4c65 /cui/source/tabpages
parentc72d5d787f7a3024f2108d6d6e192b158fb144ed (diff)
tdf#157662 SW: redline: accept/reject done for all parts
Tracked changes divided into smaller parts when they are overlapping. But if the Author, and Change time, and some more is equal, then they can be combined into 1 change later.. Modified AcceptRedline / RejectRedline, to seek for all these parts that are neightbour to each other, and can be combined, and reject/accept them all at once. Even those that are deepen in the tree. i.e.: insert that have a delete redline too. when rejecting an insert redline, that have a delete redline too, the delete redline is accepted instead. (have the same result.) when accepting an insert redline, that have a delete redline too, The delete redline remains, while the insert is deleted. (=accepted) made some limitations to lessen the probability of regression: No anonym, No table, No seqNo, and dont use it in RejectAll/AcceptAll Added unittest to check that accept/reject handle more redlines at once, but not too many.. Change-Id: Ibd0a39f7847b22b279a797babb30ba162e70a513 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157950 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'cui/source/tabpages')
0 files changed, 0 insertions, 0 deletions