diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 20:59:00 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 20:59:00 +0000 |
| commit | c3ef52cf3c26d47877740dc46faa3088be44cfae (patch) | |
| tree | 27cb3e37aa958fd1237fd7d314e6ac1361108461 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | |
| parent | 2a69b9ef97ddf46fe01de432bd0ccc1b7ce92bcb (diff) | |
| download | pdfium-c3ef52cf3c26d47877740dc46faa3088be44cfae.tar.xz | |
Rename CXFA_Occur to CXFA_OccurData
This CL renames CXFA_Occur to CXFA_OccurData to show it is part of the
data hierarchy.
Change-Id: I55096747338a9ff83ab24f528f6715a6f4302ba7
Reviewed-on: https://pdfium-review.googlesource.com/17988
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index a6441a68db..f7df149ceb 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -19,7 +19,7 @@ #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_localemgr.h" #include "xfa/fxfa/parser/cxfa_node.h" -#include "xfa/fxfa/parser/cxfa_occur.h" +#include "xfa/fxfa/parser/cxfa_occurdata.h" #include "xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h" #include "xfa/fxfa/parser/cxfa_traversestrategy_xfanode.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" @@ -49,11 +49,8 @@ bool GetOccurInfo(CXFA_Node* pOccurNode, int32_t& iMin, int32_t& iMax, int32_t& iInit) { - if (!pOccurNode) - return false; - - CXFA_Occur occur(pOccurNode); - return occur.GetOccurInfo(iMin, iMax, iInit); + return pOccurNode && + CXFA_OccurData(pOccurNode).GetOccurInfo(iMin, iMax, iInit); } CXFA_Node* FormValueNode_CreateChild(CXFA_Node* pValueNode, XFA_Element iType) { |