summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-03-31 17:37:51 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-04-03 17:19:33 +0200
commit27aa4b16bf704d0246595750daf57b57ff2577b3 (patch)
treed678594c39c8028ae8e8dc103b62f2dd06f10a16 /sw/source
parentd7c9bb6b51f44b01b23134fb22c0902d85f31329 (diff)
(related: tdf#130685) sw: fix ~SwIndexReg asserts from ...
... lcl_DeleteRedlines(), if there are redlines immediately consecutive that get deleted; merge the SwPaM ring in that case which should help. Change-Id: I07b67413ad6ee52bc81b89facc40202d0ca75e2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91595 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index cad942607c0b..7cb7901912cb 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -384,6 +384,12 @@ namespace
lcl_SetCpyPos( *pREnd, *pStt, *pCpyStt,
*pDelPam->GetPoint(), nDelCount );
}
+
+ if (pDelPam->GetNext() && *pDelPam->GetNext()->End() == *pDelPam->Start())
+ {
+ *pDelPam->GetNext()->End() = *pDelPam->End();
+ pDelPam.reset(pDelPam->GetNext());
+ }
}
}
}