From ec06e1186d0dc1b5bcac6a0d73c5d51e8a4682df Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Jan 2018 20:38:27 +0000 Subject: Change GetContainerWidgetAcc to GetContainerNode This Cl converts the code which retrieved the containers WidgetAcc to retrieve the container itself and then get the WidgetAcc from the container. Change-Id: Ib279a150500d1204e3d18f11f6a638c1f6c368ec Reviewed-on: https://pdfium-review.googlesource.com/23350 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_object.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'fxjs/xfa/cjx_object.cpp') diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 4f3b6adbc8..73ec3fa5c0 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -1158,9 +1158,9 @@ void CJX_Object::MoveBufferMapData(CXFA_Object* pDstModule) { WideString wsValue = ToNode(pDstModule)->JSObject()->GetContent(false); WideString wsFormatValue(wsValue); - CXFA_WidgetAcc* pWidgetAcc = ToNode(pDstModule)->GetContainerWidgetAcc(); - if (pWidgetAcc) - wsFormatValue = pWidgetAcc->GetFormatDataValue(wsValue); + CXFA_Node* pNode = ToNode(pDstModule)->GetContainerNode(); + if (pNode && pNode->GetWidgetAcc()) + wsFormatValue = pNode->GetWidgetAcc()->GetFormatDataValue(wsValue); ToNode(pDstModule) ->JSObject() @@ -1516,30 +1516,31 @@ void CJX_Object::Script_Som_DefaultValue(CFXJSE_Value* pValue, wsNewValue = pValue->ToWideString(); WideString wsFormatValue(wsNewValue); - CXFA_WidgetAcc* pContainerWidgetAcc = nullptr; + CXFA_Node* pContainerNode = nullptr; if (ToNode(GetXFAObject())->GetPacketType() == XFA_PacketType::Datasets) { WideString wsPicture; for (const auto& pFormNode : *(ToNode(GetXFAObject())->GetBindItems())) { if (!pFormNode || pFormNode->HasRemovedChildren()) continue; - pContainerWidgetAcc = pFormNode->GetContainerWidgetAcc(); - if (pContainerWidgetAcc) { - wsPicture = - pContainerWidgetAcc->GetPictureContent(XFA_VALUEPICTURE_DataBind); + pContainerNode = pFormNode->GetContainerNode(); + if (pContainerNode && pContainerNode->GetWidgetAcc()) { + wsPicture = pContainerNode->GetWidgetAcc()->GetPictureContent( + XFA_VALUEPICTURE_DataBind); } if (!wsPicture.IsEmpty()) break; - pContainerWidgetAcc = nullptr; + pContainerNode = nullptr; } } else if (ToNode(GetXFAObject())->GetPacketType() == XFA_PacketType::Form) { - pContainerWidgetAcc = ToNode(GetXFAObject())->GetContainerWidgetAcc(); + pContainerNode = ToNode(GetXFAObject())->GetContainerNode(); } - if (pContainerWidgetAcc) - wsFormatValue = pContainerWidgetAcc->GetFormatDataValue(wsNewValue); + if (pContainerNode && pContainerNode->GetWidgetAcc()) + wsFormatValue = + pContainerNode->GetWidgetAcc()->GetFormatDataValue(wsNewValue); SetContent(wsNewValue, wsFormatValue, true, true, true); return; -- cgit v1.2.3