sw/source/core/doc/docbm.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit 71ed878556422068041025668876fb3300c128df Author: Michael Stahl <[email protected]> AuthorDate: Mon Mar 30 16:26:41 2020 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 30 17:36:48 2020 +0200 crashtesting: null dereference of reexporting abi12570.odt to odt FLY_AT_FLY shape is anchored on SwStartNode of fly section. (regression from ef8427d12a63127a2eb867637699343d630545dd) Change-Id: I4fe70237c060cc810af82657bc5791e7024db8f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91336 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 273cc6d23de1..423aeedae79b 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -562,10 +562,12 @@ namespace sw::mark } #endif if ( (!rPaM.GetPoint()->nNode.GetNode().IsTextNode() - // huh, SwXTextRange puts one on table node? - && !rPaM.GetPoint()->nNode.GetNode().IsTableNode()) + && (eType != MarkType::UNO_BOOKMARK + // SwXTextRange can be on table node or plain start node (FLY_AT_FLY) + || !rPaM.GetPoint()->nNode.GetNode().IsStartNode())) || (!rPaM.GetMark()->nNode.GetNode().IsTextNode() - && !rPaM.GetMark()->nNode.GetNode().IsTableNode())) + && (eType != MarkType::UNO_BOOKMARK + || !rPaM.GetMark()->nNode.GetNode().IsStartNode()))) { SAL_WARN("sw.core", "MarkManager::makeMark(..)" " - refusing to create mark on non-textnode"); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
