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

[Michael Stahl (via logerrit)]

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

New commits:
commit 34ba6f515a1d96bdbf5d01b3e37828e47f6b018b
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Oct 16 14:27:04 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Sat Oct 17 09:15:25 2020 +0200

    tdf#135733 sw: fix mistake in SwUndoInserts::SetInsertRange()
    
    First init m_nDeleteTextNodes, then check it; it is inited to 1 in the
    ctor so the ++m_nSttNode was skipped.
    
    This then caused bJoinNext to be true in UndoImpl() when it should
    be false.
    
    (regression from dc7e7b94a7211c576454267c09eb108e761e4487)
    
    Change-Id: I74038ef7f8036581dd77341dc8372e87139bdb6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104433
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 7221b7638c74b13e229f7ff50349a253ebb74cfc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104344
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 28f41f817061..449f41795697 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -125,11 +125,11 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, bool bScanFlys,
         m_nSttNode = pTmpPos->nNode.GetIndex();
         m_nSttContent = pTmpPos->nContent.GetIndex();
 
+        m_nDeleteTextNodes = nDeleteTextNodes;
         if (m_nDeleteTextNodes == 0) // if a table selection is added...
         {
             ++m_nSttNode;         // ... then the CopyPam is not fully correct
         }
-        m_nDeleteTextNodes = nDeleteTextNodes;
     }
 
     // Fill m_FlyUndos with flys anchored to first and last paragraphs