diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 11:25:05 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 18:16:30 +0000 |
| commit | 9647614a5dcd00d50aacf4e000fd23a5ebb13931 (patch) | |
| tree | 2b05d094e17bde6a1464e92850dd67ef50e949f6 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | |
| parent | cbd4410908e2a4898fdd5e0d6d17591fc2c71f54 (diff) | |
| download | pdfium-9647614a5dcd00d50aacf4e000fd23a5ebb13931.tar.xz | |
Fold CXFA_OccurData into CXFA_Occur
This CL folds the CXFA_OccurData wrapper into CXFA_Occur.
Change-Id: I52e237e4f6b76f6915c397e924037562fd9eda6a
Reviewed-on: https://pdfium-review.googlesource.com/22130
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index 551f9df3fa..5a36083e88 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -25,7 +25,6 @@ #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_nodeiteratortemplate.h" #include "xfa/fxfa/parser/cxfa_occur.h" -#include "xfa/fxfa/parser/cxfa_occurdata.h" #include "xfa/fxfa/parser/cxfa_pageset.h" #include "xfa/fxfa/parser/cxfa_subform.h" #include "xfa/fxfa/parser/cxfa_template.h" @@ -603,8 +602,7 @@ CXFA_Node* FindMatchingDataNode( int32_t iMin; int32_t iMax; int32_t iInit; - std::tie(iMin, iMax, iInit) = - CXFA_OccurData(pTemplateNodeOccur).GetOccurInfo(); + std::tie(iMin, iMax, iInit) = pTemplateNodeOccur->GetOccurInfo(); if (iMax == 0) { pCurTemplateNode = pIterator->MoveToNext(); continue; @@ -759,7 +757,7 @@ CXFA_Node* CopyContainer_SubformSet(CXFA_Document* pDocument, int32_t iMin = 1; if (!bOneInstance && pOccurNode) { std::tie(iMin, iMax, iInit) = - CXFA_OccurData(static_cast<CXFA_Occur*>(pOccurNode)).GetOccurInfo(); + static_cast<CXFA_Occur*>(pOccurNode)->GetOccurInfo(); } XFA_AttributeEnum eRelation = |