| Index: xfa/fxfa/parser/xfa_document_imp.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
|
| index 919a94d8fefae8f56f4dbd5c5c3fc37a9d7b9cb2..45102c8fb64fc22f49c872faf09337ccfe90cf13 100644
|
| --- a/xfa/fxfa/parser/xfa_document_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_document_imp.cpp
|
| @@ -290,7 +290,7 @@ static void XFA_ProtoMerge_MergeNodeRecurse(CXFA_Document* pDocument,
|
| pDestNodeParent->GetNodeItem(XFA_NODEITEM_FirstChild);
|
| pFormChild;
|
| pFormChild = pFormChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
|
| - if (pFormChild->GetClassID() == pProtoNode->GetClassID() &&
|
| + if (pFormChild->GetElementType() == pProtoNode->GetElementType() &&
|
| pFormChild->GetNameHash() == pProtoNode->GetNameHash() &&
|
| pFormChild->IsUnusedNode()) {
|
| pFormChild->ClearFlag(XFA_NodeFlag_UnusedNode);
|
|
|