sw/qa/core/txtnode/data/textbox-node-split.docx |binary
sw/qa/core/txtnode/txtnode.cxx | 12 ++++++++++++
sw/source/core/txtnode/atrflyin.cxx | 17 +++++++++++++++++
3 files changed, 29 insertions(+)
New commits:
commit 9c8aa11ee7ddbae34afcce2cbfc4d521122a527b
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 13 21:06:19 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jul 14 09:02:27 2020 +0200
tdf#134431 sw: fix crash on setting anchor of textbox while splitting a para
Regression from commit 682e0488df819c191c13a03758fad0690706e508
(tdf#134099 sw: fix textbox anchors on copy-paste and undo, 2020-06-29),
the problem was that setting the anchor of a frame format triggers
"modify" notifications, but the handlers of those notifications expect a
consistent layout. This invariant is not held while we're still in
SwTextNode::SplitContentNode().
Fix the problem by updating the textbox's anchor the same way "normal"
fly frames are handled, i.e. add/remove the frame format to the new/old
text node manually and block notifications.
Change-Id: If1f07d4230540796a81d9ed46a932b67d5995462
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98690
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/core/txtnode/data/textbox-node-split.docx
b/sw/qa/core/txtnode/data/textbox-node-split.docx
new file mode 100644
index 000000000000..5760ee6e2dec
Binary files /dev/null and b/sw/qa/core/txtnode/data/textbox-node-split.docx
differ
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
index 6bb288327584..c13e75f691c2 100644
--- a/sw/qa/core/txtnode/txtnode.cxx
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -70,6 +70,18 @@ CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest,
testTextBoxCopyAnchor)
CPPUNIT_ASSERT_EQUAL(aFlyAnchor2.nNode, aDrawAnchor2.nNode);
}
+CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTextBoxNodeSplit)
+{
+ load(DATA_DIRECTORY, "textbox-node-split.docx");
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ SwDocShell* pShell = pTextDoc->GetDocShell();
+ SwWrtShell* pWrtShell = pShell->GetWrtShell();
+ pWrtShell->SttEndDoc(/*bStart=*/false);
+ // Without the accompanying fix in place, this would have crashed in
+ // SwFlyAtContentFrame::Modify().
+ pWrtShell->SplitNode();
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/atrflyin.cxx
b/sw/source/core/txtnode/atrflyin.cxx
index 902d3bda3a1e..4e61e568e702 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -208,7 +208,24 @@ void SwTextFlyCnt::SetAnchor( const SwTextNode *pNode )
{
SwFormatAnchor aTextBoxAnchor(pTextBox->GetAnchor());
aTextBoxAnchor.SetAnchor(aAnchor.GetContentAnchor());
+
+ // SwFlyAtContentFrame::Modify() assumes the anchor has a matching
layout frame, which
+ // may not be the case when we're in the process of a node split,
so block
+ // notifications.
+ bool bIsInSplitNode = pNode->GetpSwpHints() &&
pNode->GetpSwpHints()->IsInSplitNode();
+ if (bIsInSplitNode)
+ {
+ pTextBox->LockModify();
+ }
+
pTextBox->SetFormatAttr(aTextBoxAnchor);
+
+ if (bIsInSplitNode)
+ {
+ pOldNode->RemoveAnchoredFly(pTextBox);
+ aPos.nNode.GetNode().AddAnchoredFly(pTextBox);
+ pTextBox->UnlockModify();
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
