diff options
author | Lei Zhang <thestig@chromium.org> | 2016-02-24 15:30:27 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-02-24 15:30:27 -0800 |
commit | 5667203e6152eb9585aeaf9f755ecaa2664010f7 (patch) | |
tree | 1ba2c6cb9eb4508bddbbc346fdd426a638f7769b /xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp | |
parent | 38eaaf36b09b816b963015e33dc4eb02580e0462 (diff) | |
download | pdfium-5667203e6152eb9585aeaf9f755ecaa2664010f7.tar.xz |
Remove foo != NULL checks in xfa/src/fxfa.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1729983002 .
Diffstat (limited to 'xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp')
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index a9c12522a5..7e812860bf 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -704,7 +704,7 @@ static CXFA_Node* XFA_DataMerge_FindMatchingDataNode( default: break; } - if (pCurTemplateNode == pTemplateNode && pResult != NULL) { + if (pCurTemplateNode == pTemplateNode && pResult) { bSelfMatch = TRUE; } break; @@ -774,7 +774,7 @@ static CXFA_Node* XFA_DataMerge_CopyContainer_SubformSet( : NULL; if (CXFA_Node* pOccurTemplateNode = pTemplateNode->GetFirstChildByClass(XFA_ELEMENT_Occur)) { - pOccurNode = pInstMgrNode != NULL + pOccurNode = pInstMgrNode ? XFA_NodeMerge_CloneOrMergeContainer( pDocument, pInstMgrNode, pOccurTemplateNode, FALSE) : pOccurTemplateNode; |