| Index: xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
|
| diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
|
| index c2a53ac70ed07c8badad365e0eb1fd0e69a62de5..da6b57f3d19e42f5164c3547f5ea25dde7a1ec37 100644
|
| --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
|
| +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
|
| @@ -4,7 +4,9 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "xfa/src/foxitlib.h"
|
| +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
|
| +
|
| +#include "core/include/fxcrt/fx_ext.h"
|
| #include "xfa/src/fxfa/src/common/xfa_docdata.h"
|
| #include "xfa/src/fxfa/src/common/xfa_doclayout.h"
|
| #include "xfa/src/fxfa/src/common/xfa_document.h"
|
| @@ -16,8 +18,8 @@
|
| #include "xfa/src/fxfa/src/common/xfa_utils.h"
|
| #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
|
| #include "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h"
|
| -#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
|
| #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
|
| +
|
| static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode,
|
| int32_t& iMin,
|
| int32_t& iMax,
|
|
|