summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa/src/parser
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fxfa/src/parser')
-rw-r--r--xfa/src/fxfa/src/parser/xfa_basic_data.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_basic_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_debug_parser.cpp18
-rw-r--r--xfa/src/fxfa/src/parser/xfa_debug_parser.h9
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp23
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_imp.h9
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp23
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_serialize.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_locale.cpp24
-rw-r--r--xfa/src/fxfa/src/parser/xfa_localemgr.cpp24
-rw-r--r--xfa/src/fxfa/src/parser/xfa_localevalue.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_object_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_parser_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_utils_imp.cpp22
-rw-r--r--xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp6
30 files changed, 265 insertions, 355 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
index 99b02b8b79..e55cf7335c 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
#include "xfa_script_datawindow.h"
#include "xfa_script_eventpseudomodel.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
index 0b5f63efa6..fbd0d95dcb 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
extern const XFA_PACKETINFO g_XFAPacketData[];
extern const int32_t g_iXFAPacketCount;
diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp b/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp
deleted file mode 100644
index 4f5365e1d8..0000000000
--- a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.h b/xfa/src/fxfa/src/parser/xfa_debug_parser.h
deleted file mode 100644
index 90dce89d3e..0000000000
--- a/xfa/src/fxfa/src/parser/xfa_debug_parser.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef _XFA_DEBUG_PARSER_H_
-#define _XFA_DEBUG_PARSER_H_
-#endif
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
index 5e2b31a723..7f0de75619 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#define XFA_HASHCODE_Group 0xf7f75fcd
class CXFA_TraverseStrategy_DDGroup {
public:
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 93ec1da24e..baab5eb02c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
@@ -4,20 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
-#include "xfa_document_imp.h"
#include "xfa_document_datadescription_imp.h"
#include "xfa_document_datamerger_imp.h"
#include "xfa_document_layout_imp.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
index 644a29bb2b..d5067cdacf 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
#include "xfa_document_layout_imp.h"
#include "xfa_script_datawindow.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.h b/xfa/src/fxfa/src/parser/xfa_document_imp.h
deleted file mode 100644
index 53404c0d9e..0000000000
--- a/xfa/src/fxfa/src/parser/xfa_document_imp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef _XFA_DOCUMENT_IMP_H_
-#define _XFA_DOCUMENT_IMP_H_
-#endif
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
index 4d678bf75d..861ff1f67b 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
@@ -4,20 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
-#include "xfa_document_imp.h"
#include "xfa_document_layout_imp.h"
#include "xfa_document_datamerger_imp.h"
#include "xfa_layout_itemlayout.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
index 558765270a..c381aa9e97 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_document_serialize.h"
IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) {
return new CXFA_DataImporter(pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
index e98795b5c9..562beb9001 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_document_layout_imp.h"
#include "xfa_layout_itemlayout.h"
#include "xfa_layout_pagemgr_new.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
index 1f24c565b1..7d12a289e8 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_document_layout_imp.h"
#include "xfa_layout_itemlayout.h"
#include "xfa_layout_pagemgr_new.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
index f83b772003..aedd090371 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_document_datamerger_imp.h"
#include "xfa_document_layout_imp.h"
#include "xfa_layout_itemlayout.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp
index 50157aa83f..bfadefcf4c 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp
@@ -4,19 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../../../core/include/fxcrt/fx_xml.h"
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "core/include/fxcrt/fx_xml.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_locale.h"
static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%";
diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
index 62310f5845..f4b20668ee 100644
--- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
@@ -4,19 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../../../core/include/fxcrt/fx_xml.h"
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "core/include/fxcrt/fx_xml.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_locale.h"
const uint8_t g_enUS_Locale[] = {
diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
index 93c371d996..24731b0668 100644
--- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
static const FX_DOUBLE fraction_scales[] = {0.1,
0.01,
0.001,
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
index 9f77d7e75a..be2bed9334 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
#include "xfa_document_layout_imp.h"
CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags)
diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
index 86276483b6..6eb0adf647 100644
--- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) {
uint8_t r = 0, g = 0, b = 0;
if (wsValue.GetLength() == 0) {
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
index 937d6fa2ce..6064c0158f 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_basic_imp.h"
#include "xfa_parser_imp.h"
IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory,
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
index e0f4fee342..80258b45aa 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_datawindow.h"
CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
index 479c2592bd..74786ad75c 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_eventpseudomodel.h"
CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
index 21a4fa1997..bf79220ccb 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_hostpseudomodel.h"
CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
index d35c48f1a9..9f4f0232ef 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_imp.h"
#include "xfa_script_resolveprocessor.h"
#include "xfa_script_nodehelper.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
index da4ad54017..0b344129dc 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_layoutpseudomodel.h"
#include "xfa_document_layout_imp.h"
#include "xfa_layout_appadapter.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
index bdb8c0b309..910d148f57 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_logpseudomodel.h"
CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
index 44eb698a54..96ceeb5318 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_nodehelper.h"
#include "xfa_script_imp.h"
CXFA_NodeHelper::CXFA_NodeHelper(void)
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
index befff73141..9645a9d2c2 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_resolveprocessor.h"
#include "xfa_script_nodehelper.h"
#include "xfa_script_imp.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
index f5ca9e2a19..53fb24dee1 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
#include "xfa_script_signaturepseudomodel.h"
CScript_SignaturePseudoModel::CScript_SignaturePseudoModel(
CXFA_Document* pDocument)
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
index abe5fdbd48..3e4bc303e1 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
@@ -4,18 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
-#include "../common/xfa_object.h"
-#include "../common/xfa_document.h"
-#include "../common/xfa_parser.h"
-#include "../common/xfa_script.h"
-#include "../common/xfa_docdata.h"
-#include "../common/xfa_doclayout.h"
-#include "../common/xfa_debug.h"
-#include "../common/xfa_localemgr.h"
-#include "../common/xfa_fm2jsapi.h"
-#include "xfa_debug_parser.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/src/common/xfa_script.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_localemgr.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) {
XFA_ELEMENT eType = pNode->GetClassID();
eWidgetType = eType;
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
index 174673eb72..81fdc4e322 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../testing/gtest/include/gtest/gtest.h"
-#include "../../../foxitlib.h"
-#include "../common/xfa_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/xfa_utils.h"
TEST(XfaUtilsImp, XFA_MapRotation) {
struct TestCase {