sw/source/core/crsr/crsrsh.cxx | 2 +- sw/source/core/txtnode/ndtxt.cxx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 981f57d24193ae163ea15fe6e3a19ba31a4b0aa8 Author: Michael Stahl <[email protected]> AuthorDate: Fri Sep 14 15:18:13 2018 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Sep 14 15:18:13 2018 +0200 fix plitNode handling of merged fra,mes Change-Id: I67a4cc0c05c978511ee8094788e82c9cd94cbd50 diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 6414f900887b..64decace7a77 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -742,6 +742,7 @@ SwTextNode *SwTextNode::SplitContentNode(const SwPosition & rPos, } } +#ifndef NDEBUG if (isHide) // otherwise flags won't be set anyway { // First @@ -788,6 +789,7 @@ SwTextNode *SwTextNode::SplitContentNode(const SwPosition & rPos, break; } } +#endif { // Send Hint for PageDesc. This should be done in the Layout when commit 4ea29dbeee416b7f1dc2aed6fcfaeceee277cf8c Author: Michael Stahl <[email protected]> AuthorDate: Fri Sep 14 15:13:45 2018 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Sep 14 15:13:45 2018 +0200 fix IsSelOnePara Change-Id: I8a893978b208a9db7dddf80d27e325b8c548eb20 diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index b6d662b372db..ea687f0b2956 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1065,7 +1065,7 @@ bool SwCursorShell::IsSelOnePara() const if (GetLayout()->IsHideRedlines()) { SwContentFrame const*const pFrame(GetCurrFrame(false)); - auto const n(m_pCurrentCursor->GetPoint()->nNode.GetIndex()); + auto const n(m_pCurrentCursor->GetMark()->nNode.GetIndex()); return FrameContainsNode(*pFrame, n); } return false; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
