commit ba5584a3ce86c2db52e2e4a4b91254741b2616ec
author Michael Stahl <Michael.Stahl@cib.de> Wed Oct 14 16:10:29 2020 +0200
committer Caolán McNamara <caolanm@redhat.com> Wed Oct 14 21:40:00 2020 +0200
tree 41ca8fe33aad3295ea09f407efffce283a77eb93
parent 10c638e520096a0cc282d91ac2a447509f674a6f

tdf#136577 sw: fix Undo of Replace with nothing

The UI doesn't allow to replace an empty selection anyway, but it now
happens on Undo.

(regression from e1629c210ad78310e3d48c0756723134a27b89df)

Change-Id: I468f28335beaeb8c42df8ed4cfc90f2c03129239
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104308
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit d3eca4177a78c3db17b4699ea6e071e52488c46f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104305
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/source/core/doc/DocumentContentOperationsManager.cxx

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index bee95be..17bbd2b 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4256,7 +4256,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUString& rStr,
        const bool bRegExReplace )
{
    if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
    if (!rPam.HasMark())
        return false;

    bool bJoinText, bJoinPrev;