[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25f4c91e1a501c20c84ac0d54bea295596bf120d
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Oct 14 16:10:29 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Oct 15 15:29:56 2020 +0200

    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 at cib.de>
    (cherry picked from commit d3eca4177a78c3db17b4699ea6e071e52488c46f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104305
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit ba5584a3ce86c2db52e2e4a4b91254741b2616ec)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104333
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 909c88632f5e..0199260aa6cf 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4261,7 +4261,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;