commit a5d4f32e6512acdec6402bd18ff958f07c9d327a
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 08:39:17 2021 +0100
tree 6bf569dab8894d277d3b0498aa10f6633813082f
parent 364c807cf22de7898e918a9cd1fa7e5392ca7577

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/+/126821
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

sw/source/core/doc/DocumentContentOperationsManager.cxx

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 5311bfb..8bff255 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4581,8 +4581,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;