diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-06-22 22:04:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-22 22:04:54 -0700 |
| commit | 070fcdfeafb17a9d3ada1418f48fd7f19aa4cf83 (patch) | |
| tree | 2e9d0daaf76b0d2ac13f8b6d0b10dec11d1c6264 /xfa/fxfa/parser/xfa_document_imp.cpp | |
| parent | a5ab26b8aa9ed12af8bdf323cb297f61cbfeb1fa (diff) | |
| download | pdfium-070fcdfeafb17a9d3ada1418f48fd7f19aa4cf83.tar.xz | |
Update GetClassID to GetElementType
The GetClassID method actually returns the XFA_Element, change the name of the
method to be more suggestive of the return value.
The GetClassID was sort-of polymorphich and would call down to subclasses. This
CL changes the data to be stored on the CXFA_Object class and just returns what
is set. The values are set in the constructor as needed.
Review-Url: https://codereview.chromium.org/2082573007
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_imp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp index 919a94d8fe..45102c8fb6 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); |