sw/source/core/undo/untblk.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ae6069c073365d8b5162a42b2618f077c7738caf
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Oct 16 14:27:04 2020 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Sat Oct 17 10:53:30 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.st...@cib.de>
(cherry picked from commit 7221b7638c74b13e229f7ff50349a253ebb74cfc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104343
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 512a02921546..3742414041d4 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -124,11 +124,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
