diff options
author | dsinclair <dsinclair@chromium.org> | 2016-06-23 09:20:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-23 09:20:32 -0700 |
commit | 41cb62ec84f8e8ca4ce8075fd4d825f8e22292a2 (patch) | |
tree | a47d8cdef2e2c628b4698e6467fd6cd1fb5646a2 /xfa/fxfa/parser/xfa_document_datadescription_imp.cpp | |
parent | ab5b60edba7e8e80d7ee964d58e58b384fcfe5ee (diff) | |
download | pdfium-41cb62ec84f8e8ca4ce8075fd4d825f8e22292a2.tar.xz |
Cleanup some variable namings.chromium/2778
This CL cleans up some variable namings from the XFA_Element enum change.
Review-Url: https://codereview.chromium.org/2093663002
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datadescription_imp.cpp')
-rw-r--r-- | xfa/fxfa/parser/xfa_document_datadescription_imp.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp b/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp index 5c7fdfe83a..97ea8dd54b 100644 --- a/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp @@ -31,18 +31,17 @@ void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode, pDataChild; pDataChild = pDataChild->GetNodeItem(XFA_NODEITEM_NextSibling)) { uint32_t dwNameHash = pDataChild->GetNameHash(); - XFA_Element eType = pDataChild->GetElementType(); - if (!dwNameHash) { + if (!dwNameHash) continue; - } + CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_DDGroup> sIterator(pDataDescriptionNode); for (CXFA_Node* pDDGroupNode = sIterator.GetCurrent(); pDDGroupNode; pDDGroupNode = sIterator.MoveToNext()) { if (pDDGroupNode != pDataDescriptionNode) { - if (pDDGroupNode->GetElementType() != XFA_Element::DataGroup) { + if (pDDGroupNode->GetElementType() != XFA_Element::DataGroup) continue; - } + CFX_WideString wsNamespace; if (!pDDGroupNode->TryNamespace(wsNamespace) || wsNamespace != FX_WSTRC(L"http://ns.adobe.com/data-description/")) { @@ -50,12 +49,11 @@ void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode, } } CXFA_Node* pDDNode = pDDGroupNode->GetFirstChildByName(dwNameHash); - if (!pDDNode) { + if (!pDDNode) continue; - } - if (pDDNode->GetElementType() != eType) { + if (pDDNode->GetElementType() != pDataChild->GetElementType()) break; - } + pDataChild->SetDataDescriptionNode(pDDNode); XFA_DataDescription_UpdateDataRelation(pDataChild, pDDNode); break; |