diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-12-06 22:28:05 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-22 11:53:45 +0200 |
| commit | 0bb17d34242caf6dc8caabbbeb81f24379ce4619 (patch) | |
| tree | fa705d9e3440a5f8caac8875813bff7582685ddd | |
| parent | ad685c44976873a71bcdc1b81a3f6ea7f571bc05 (diff) | |
ofz#4518 sw: why do we need to set IgnoreDeleteRedlines
This mysterious IgnoreDeleteRedlines flag was set in this particular
case of a new DELETE redline inside or equal to an existing INSERT
redline since initial import.
Why it's needed is documented nowhere.
If it is needed, then i'm assuming it's only needed to prevent
deleting redlines that are actually in the pNewRedl range;
it makes no sense to prevent deletion of redlines inside a footnote
when that footnote is deleted, because there is no valid
position left for such redlines.
The problem here is that in the range that is deleted there is a
footnote and there is another redline inside the footnote text
and that has its positions corrected rather ridiculously by
DelBookmarks() because DeleteRedline() ignored it due to the flag.
Remove the call to MaybeNotifyRedlineModification(), to fix a
SwTiledRenderingTest::testRedlineUpdateCallback failure,
assuming that it is only called to compensate for the flag
being set, seeing as this is the only such call in AppendRedline.
Reviewed-on: https://gerrit.libreoffice.org/46016
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 0999ac11796d2f2c7439df8c5f65d73119716a7d)
Reviewed-on: https://gerrit.libreoffice.org/46513
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 33efb8806ea16bcc140f084503ef1c9e49a844f8)
Change-Id: I0f266213b8525f7bee06ee0d56290f4524bf0d85
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index cc1be6ae1c3c..bba33904d130 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -1219,8 +1219,6 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall case POS_INSIDE: if( bCallDelete ) { - meRedlineFlags |= RedlineFlags::IgnoreDeleteRedlines; - // DeleteAndJoin does not yield the // desired result if there is no paragraph to // join with, i.e. at the end of the document. @@ -1242,8 +1240,6 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall } delete pNewRedl; pNewRedl = nullptr; - if (eCmpPos == POS_INSIDE) - MaybeNotifyRedlineModification(pRedl, &m_rDoc); break; case POS_OUTSIDE: |