diff options
| author | weili <weili@chromium.org> | 2016-06-02 15:48:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-02 15:48:16 -0700 |
| commit | db444d2063df6c574882d9263e885c4fe1134133 (patch) | |
| tree | 27ce4a3f181ae0b5ad4eff6893016e7d49dfce0a /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | |
| parent | ad700c2c1fc3c3843dae71e5982f462e42efc987 (diff) | |
| download | pdfium-db444d2063df6c574882d9263e885c4fe1134133.tar.xz | |
Fix all the code which has duplicate variable declarations
When there are duplicate variable declarations, the inner names shadow the
outter ones. This is error prone and harder to read. Remove all the
instances found by /analyze.
BUG=chromium:613623, chromium:427616
Review-Url: https://codereview.chromium.org/2027273002
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index 03643cd988..7d7b50fb3f 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -811,7 +811,7 @@ static CXFA_Node* XFA_DataMerge_CopyContainer_SubformSet( sNodeIterator.MoveToNext(); } else { CFX_MapPtrTemplate<CXFA_Node*, CXFA_Node*> subformMapArray; - CXFA_NodeArray subformArray; + CXFA_NodeArray nodeArray; for (; iMax < 0 || iCurRepeatIndex < iMax; iCurRepeatIndex++) { FX_BOOL bSelfMatch = FALSE; XFA_ATTRIBUTEENUM eBindMatch = XFA_ATTRIBUTEENUM_None; @@ -830,11 +830,11 @@ static CXFA_Node* XFA_DataMerge_CopyContainer_SubformSet( XFA_DataMerge_CreateDataBinding(pSubformNode, pDataNode); ASSERT(pSubformNode); subformMapArray.SetAt(pSubformNode, pDataNode); - subformArray.Add(pSubformNode); + nodeArray.Add(pSubformNode); } subformMapArray.GetStartPosition(); - for (int32_t iIndex = 0; iIndex < subformArray.GetSize(); iIndex++) { - CXFA_Node* pSubform = subformArray[iIndex]; + for (int32_t iIndex = 0; iIndex < nodeArray.GetSize(); iIndex++) { + CXFA_Node* pSubform = nodeArray[iIndex]; CXFA_Node* pDataNode = reinterpret_cast<CXFA_Node*>(subformMapArray.GetValueAt(pSubform)); for (CXFA_Node* pTemplateChild = |