summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
diff options
context:
space:
mode:
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.cpp4
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;