summaryrefslogtreecommitdiff
path: root/sw/source/core/inc/DocumentRedlineManager.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-15 13:51:04 +0200
committerCaolán McNamara <caolanm@redhat.com>2017-09-27 11:54:45 +0200
commit34905a6e9e0c262b61e5969274b661692af44a46 (patch)
tree02d850c2d7a22b76b25c475f99c5e08c1ac2b566 /sw/source/core/inc/DocumentRedlineManager.hxx
parent31baba076f6058d675588b2715a3322455c87500 (diff)
ofz#3301 sw: DeleteAndJoin found yet another way to delete new redline
Not only can that happen in CompressRedlines(), it can also happen in the SwComparePosition::Outside case when the DeleteRedline() decides in particular circumstances to split up the inserted new redline. Arguably it's wrong to split up the new redline in this case; not sure if that ever happens in a legitimate use case though. Avoid this by removing the hack to temporarily insert the new redline and instead create a temporary SwUnoCursor that will be corrected on behalf of the new redline, while the new redline is parked on a safe node. This not only avoids the crash on this file but also makes the "corrupted redline table" assertions go away. Change-Id: I478f4cfc53a19d2cf2f0937f631962f80b1815ff Reviewed-on: https://gerrit.libreoffice.org/42322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/inc/DocumentRedlineManager.hxx')
-rw-r--r--sw/source/core/inc/DocumentRedlineManager.hxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 9ba7e5bd7f1d..afe8d4090271 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -138,7 +138,6 @@ private:
sal_uInt16 mnAutoFormatRedlnCommentNo; /**< SeqNo for conjoining of AutoFormat-Redlines.
by the UI. Managed by SwAutoFormat! */
css::uno::Sequence <sal_Int8 > maRedlinePasswd;
- bool m_isForbidCompressRedlines = false;
};
}