diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-15 14:04:12 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-06-15 15:55:11 +0200 |
| commit | b314735568c1e9ab8ca52413017425bc2ef12973 (patch) | |
| tree | 90ea9688b2b267981d0c9f4bdedeb96aa82dc53d | |
| parent | f9f30f51166589cfcab4e965d9f76eebcad491ab (diff) | |
tdf#132321 tdf#133957 sw: for at-para fly, ignore anchor SwIndex
... because it's always 0, and not registered at the node; this fixes
the case when it's anchored at a non-empty last node of a section.
(follow-up to a0d0665060b75c1e7f0234b698c940d2f9d600f8)
Change-Id: I627e11e84a2dcfc2944d3c9f3fd22e3c3785e505
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96350
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | sw/source/core/undo/undobj.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index cff8a6b758b8..2b081f723368 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1524,7 +1524,9 @@ static bool IsAtEndOfSection(SwPosition const& rAnchorPos) SwContentNode *const pNode(SwNodes::GoPrevious(&node)); assert(pNode); assert(rAnchorPos.nNode <= node); // last valid anchor pos is last content - return node == rAnchorPos.nNode && rAnchorPos.nContent == pNode->Len(); + return node == rAnchorPos.nNode + // at-para fly has no SwIndex! + && (rAnchorPos.nContent == pNode->Len() || rAnchorPos.nContent.GetIdxReg() == nullptr); } static bool IsAtStartOfSection(SwPosition const& rAnchorPos) |