sw/source/core/doc/DocumentContentOperationsManager.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit f37d4d3b31bad645e3bf12175b35864303489996
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Mar 31 17:37:51 2020 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Apr 7 10:49:37 2020 +0200
(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.st...@cib.de>
(cherry picked from commit 27aa4b16bf704d0246595750daf57b57ff2577b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91522
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit c7c157c905b8b70aa3e426a6e4d2ba40963caf1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91759
Tested-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index f39ce71378ac..e09e04597409 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -375,6 +375,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());
+ }
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
