diff options
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_imp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp index ffc7ed6729..76ec4ec465 100644 --- a/xfa/fxfa/parser/xfa_document_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_imp.cpp @@ -292,8 +292,8 @@ static void XFA_ProtoMerge_MergeNodeRecurse(CXFA_Document* pDocument, pFormChild = pFormChild->GetNodeItem(XFA_NODEITEM_NextSibling)) { if (pFormChild->GetClassID() == pProtoNode->GetClassID() && pFormChild->GetNameHash() == pProtoNode->GetNameHash() && - pFormChild->HasFlag(XFA_NODEFLAG_UnusedNode)) { - pFormChild->ClearFlag(XFA_NODEFLAG_UnusedNode); + pFormChild->IsUnusedNode()) { + pFormChild->ClearFlag(XFA_NodeFlag_UnusedNode); pExistingNode = pFormChild; break; } @@ -319,7 +319,7 @@ static void XFA_ProtoMerge_MergeNode(CXFA_Document* pDocument, CXFA_NodeIterator sIterator(pDestNode); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - pNode->SetFlag(XFA_NODEFLAG_UnusedNode, true); + pNode->SetFlag(XFA_NodeFlag_UnusedNode, true); } } pDestNode->SetTemplateNode(pProtoNode); @@ -333,7 +333,7 @@ static void XFA_ProtoMerge_MergeNode(CXFA_Document* pDocument, CXFA_NodeIterator sIterator(pDestNode); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - pNode->ClearFlag(XFA_NODEFLAG_UnusedNode); + pNode->ClearFlag(XFA_NodeFlag_UnusedNode); } } } |