diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-10 20:47:55 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-10 20:47:55 +0000 |
| commit | 3ffde1bc73156098e78e5e303b3f5198a1d073b8 (patch) | |
| tree | c3a13bfda69bfb9bc4a85855d588d64d27faaa57 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | |
| parent | 326c38c4f2749e61fa2dec1d0f326e4099d6a24c (diff) | |
| download | pdfium-3ffde1bc73156098e78e5e303b3f5198a1d073b8.tar.xz | |
Rename GetTemplateNode to GetTemplateNodeIfExists
This CL makes it explicit that GetTemplateNodeIfExists can return
nullptr. Various call sites are updated as needed.
Change-Id: If6edd5962b59e7e4ce3dbe9bbdc957783cf76abe
Reviewed-on: https://pdfium-review.googlesource.com/22678
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index e2e212f70b..3332d90b66 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -1090,7 +1090,7 @@ void UpdateBindingRelations(CXFA_Document* pDocument, CXFA_Node* pDataNode = pFormNode->GetBindData(); if (eType == XFA_Element::Subform || eType == XFA_Element::ExclGroup || eType == XFA_Element::Field) { - CXFA_Node* pTemplateNode = pFormNode->GetTemplateNode(); + CXFA_Node* pTemplateNode = pFormNode->GetTemplateNodeIfExists(); CXFA_Bind* pTemplateNodeBind = pTemplateNode ? pTemplateNode->GetFirstChildByClass<CXFA_Bind>(XFA_Element::Bind) @@ -1168,7 +1168,9 @@ void UpdateBindingRelations(CXFA_Document* pDocument, bParentDataRef = true; if (!pDataNode && bDataRef) { WideString wsRef = - pTemplateNodeBind->JSObject()->GetCData(XFA_Attribute::Ref); + pTemplateNodeBind + ? pTemplateNodeBind->JSObject()->GetCData(XFA_Attribute::Ref) + : L""; uint32_t dFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_CreateNode; XFA_RESOLVENODE_RS rs; |