diff options
| author | Rosemary Sebastian <rosemary.seb8@gmail.com> | 2017-07-22 15:24:45 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-25 23:01:09 +0200 |
| commit | 355715d333bced59256afb005ac9f243d37aa23e (patch) | |
| tree | ef5bc5a7ac47639084cba817a092a9ac189cc937 | |
| parent | e9d64ca080ed0cf2dcb56be13bee1bffbff880fd (diff) | |
tdf#109267: Fix crash during undo of delete inside redline insert
Change-Id: I070ce600c10f469b914cc1d6c036a55f33dc9529
(cherry picked from commit bd37233020266a5892d6ec7022688e3dfb9cef75)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 0baf6586c449..1a62a0b04c64 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -888,7 +888,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall ( pNewRedl->GetContentIdx() == nullptr ) ) bDelete = true; } - else if( SwComparePosition::Inside == eCmpPos || SwComparePosition::Equal == eCmpPos) + else if( SwComparePosition::Inside == eCmpPos ) + { + bDelete = true; + bMerged = true; + } + else if( SwComparePosition::Equal == eCmpPos ) bDelete = true; if( bDelete ) |