[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

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

New commits:
commit 55210211d899e3929fb8d7760483206937a3b0e4
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Sep 7 14:27:46 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 20 17:39:09 2018 +0200

    sw: fix usage of wrong string in SwUndoOverwrite::RedoImpl()
    
    At this point the "aDelStr" is in the document, don't use invalid index.
    
    Change-Id: I0aae8839e9669e3a474266a345b54a1e7e6db38f
    (cherry picked from commit a44d7917655dfec3f6a101752c68de8c46aeb822)
    Reviewed-on: https://gerrit.libreoffice.org/60748
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index beafde6a4773..dbc82afc684f 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -267,7 +267,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
     {
         rIdx.Assign( pTextNd, nSttContent );
         pCurrentPam->SetMark();
-        pCurrentPam->GetMark()->nContent += aInsStr.getLength();
+        pCurrentPam->GetMark()->nContent += aDelStr.getLength();
         pDoc->getIDocumentRedlineAccess().DeleteRedline( *pCurrentPam, false, USHRT_MAX );
         pCurrentPam->DeleteMark();
     }