diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-09-19 11:00:15 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-09-19 12:17:09 +0200 |
| commit | 655874489a13af50b763b75c188b2a8db52c7fc0 (patch) | |
| tree | 6c74b807d318ea271797895722f3a7c0473379cc | |
| parent | xmlsecurity : simplify DigitalSignature (diff) | |
| download | core-655874489a13af50b763b75c188b2a8db52c7fc0.tar.gz core-655874489a13af50b763b75c188b2a8db52c7fc0.zip | |
tdf#157131 sw: only check for table in same top-level section
The problem is that SwNodes::FindPrvNxtFrameNode() is called with the
first node in the body and moves backwards to a node that is in a table
in a text frame.
(regression from commit faf2d9e2cb13c3750ac359338f8f31fc1afce368)
Change-Id: I9bd353f07ea6361b332134186a6a4462119b597c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157045
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | sw/source/core/docnode/nodes.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 9f9c516e8f3b..c6ecb9ccf974 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -2250,7 +2250,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( const SwNode& rFrameNd, { pFrameNd = GoPrevSection( &aIdx, true, false ); // did we move *into* a table? - if (pFrameNd) + if (pFrameNd && ::CheckNodesRange(aIdx.GetNode(), rFrameNd, true)) { for (SwTableNode * pTable = pFrameNd->FindTableNode(); pTable && pTable->EndOfSectionIndex() < rFrameNd.GetIndex(); @@ -2328,7 +2328,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( const SwNode& rFrameNd, { pFrameNd = GoNextSection( &aIdx, true, false ); // did we move *into* a table? - if (pFrameNd) + if (pFrameNd && ::CheckNodesRange(aIdx.GetNode(), rFrameNd, true)) { for (SwTableNode * pTable = pFrameNd->FindTableNode(); pTable && pEnd->GetIndex() < pTable->GetIndex(); |