| Index: xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| diff --git a/xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| similarity index 98%
|
| rename from xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| rename to xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| index ecbbba7579fecd50c82d751490c623cffd0d0ed1..0dc087a48f06c3ae29e56431c42b77b17675ada7 100644
|
| --- a/xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| @@ -4,21 +4,21 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "xfa/src/fxfa/parser/xfa_document_datamerger_imp.h"
|
| +#include "xfa/fxfa/parser/xfa_document_datamerger_imp.h"
|
|
|
| #include "core/include/fxcrt/fx_ext.h"
|
| -#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
|
| -#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
|
| -#include "xfa/src/fxfa/parser/xfa_docdata.h"
|
| -#include "xfa/src/fxfa/parser/xfa_doclayout.h"
|
| -#include "xfa/src/fxfa/parser/xfa_document.h"
|
| -#include "xfa/src/fxfa/parser/xfa_document_datadescription_imp.h"
|
| -#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
|
| -#include "xfa/src/fxfa/parser/xfa_localemgr.h"
|
| -#include "xfa/src/fxfa/parser/xfa_object.h"
|
| -#include "xfa/src/fxfa/parser/xfa_parser.h"
|
| -#include "xfa/src/fxfa/parser/xfa_script.h"
|
| -#include "xfa/src/fxfa/parser/xfa_utils.h"
|
| +#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
|
| +#include "xfa/fxfa/parser/xfa_basic_imp.h"
|
| +#include "xfa/fxfa/parser/xfa_docdata.h"
|
| +#include "xfa/fxfa/parser/xfa_doclayout.h"
|
| +#include "xfa/fxfa/parser/xfa_document.h"
|
| +#include "xfa/fxfa/parser/xfa_document_datadescription_imp.h"
|
| +#include "xfa/fxfa/parser/xfa_document_layout_imp.h"
|
| +#include "xfa/fxfa/parser/xfa_localemgr.h"
|
| +#include "xfa/fxfa/parser/xfa_object.h"
|
| +#include "xfa/fxfa/parser/xfa_parser.h"
|
| +#include "xfa/fxfa/parser/xfa_script.h"
|
| +#include "xfa/fxfa/parser/xfa_utils.h"
|
|
|
| static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode,
|
| int32_t& iMin,
|
|
|