| commit | f94869d8f0f0271bdf40fc0324f7a3bfa7222370 | [log] |
|---|---|---|
| author | Michael Stahl <michael.stahl@allotropia.de> | Tue Dec 14 17:32:28 2021 +0100 |
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | Wed Dec 15 13:52:36 2021 +0100 |
| tree | 2576369078f5c8bd8f0e2b106b78041c6b11bf2e | |
| parent | 581af2e7dcc87728ef79b11a7051f4b09d443160 [diff] |
tdf#136855 sw: fix ReplaceRangeImpl() restoring of rPam This broke in CWS swrefactormarks2 (commit df6d312ca537402463e4eb0530f22b956600fc02) but for spell-checking the ReplaceRange() wasn't used until commit e1629c210ad78310e3d48c0756723134a27b89df. Change-Id: I4a6256b65b89e21e9e87ff45d0c5e6c4577a5846 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d16c5f47600d236e911ae50d0e58a3f2256f5a61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126822 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 6af4500fffe0d0db03b4d4a7e77cf627124aefc1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126826 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 4d0891a..457e5aa 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4477,8 +4477,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( eOld ); *rPam.GetPoint() = pBkmk->GetMarkPos(); if(pBkmk->IsExpanded()) *rPam.GetMark() = pBkmk->GetOtherMarkPos(); *rPam.GetMark() = pBkmk->IsExpanded() ? pBkmk->GetOtherMarkPos() : pBkmk->GetMarkPos(); m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk); } bJoinText = false;