diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-21 17:30:55 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-07-22 11:20:55 +0200 |
| commit | 14bdbc36f0cf3913f6de10c746044b6aadf37095 (patch) | |
| tree | 7e878d32a415f868db60d3d363e81b1b59d2d6ed /sw | |
| parent | b877b9bc894892e61f0d6311729f7b01139923d6 (diff) | |
tdf#132911 sw_redlinehide: fix assert in CopyImplImpl()
With Ctrl+A, Ctrl+X, Ctrl+V we get the bAfterTable = true case;
line 4722 does pCopyPam->GetPoint()->nNode-- and then line 5085 does
pCopyPam->GetPoint()->nNode++ but the problem is that nContent still
points to the same node as initially while the node after the table end
node is now a different one, i.e. nNode and nContent point to different
nodes and something in redlining asserts becuase of that with
"Assertion `m_pIndexReg == rIndex.m_pIndexReg' failed."; we don't get
to step 4 anyway.
(reportedly something changed with commit
4532845e22c10f252840887e55002307227b2390 but it's a mystery what that
would be)
Change-Id: I23744fad543e1e7bfcc11c4b488d4469ba9e509c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99166
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index cbe579f18a0d..7c651d0cb26d 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -5080,10 +5080,10 @@ bool DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo pCopyPam->Move( fnMoveForward, bCanMoveBack ? GoInContent : GoInNode ); else { - // Reset the offset to 0 as it was before the insertion - pCopyPam->GetPoint()->nContent = 0; - pCopyPam->GetPoint()->nNode++; + + // Reset the offset to 0 as it was before the insertion + pCopyPam->GetPoint()->nContent.Assign(pCopyPam->GetPoint()->nNode.GetNode().GetContentNode(), 0); // If the next node is a start node, then step back: the start node // has been copied and needs to be in the selection for the undo if (pCopyPam->GetPoint()->nNode.GetNode().IsStartNode()) |