summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fxfa')
-rw-r--r--xfa/src/fxfa/app/xfa_checksum.cpp2
-rw-r--r--xfa/src/fxfa/app/xfa_checksum.h2
-rw-r--r--xfa/src/fxfa/app/xfa_ffapp.h2
-rw-r--r--xfa/src/fxfa/app/xfa_ffdoc.cpp2
-rw-r--r--xfa/src/fxfa/app/xfa_fontmgr.h2
-rw-r--r--xfa/src/fxfa/app/xfa_fwltheme.cpp2
-rw-r--r--xfa/src/fxfa/app/xfa_textlayout.cpp4
-rw-r--r--xfa/src/fxfa/app/xfa_textlayout.h2
-rw-r--r--xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp2
-rw-r--r--xfa/src/fxfa/parser/xfa_basic_imp.cpp6
-rw-r--r--xfa/src/fxfa/parser/xfa_basic_imp.h2
-rw-r--r--xfa/src/fxfa/parser/xfa_document_serialize.cpp2
-rw-r--r--xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp2
-rw-r--r--xfa/src/fxfa/parser/xfa_locale.h2
-rw-r--r--xfa/src/fxfa/parser/xfa_localemgr.h4
-rw-r--r--xfa/src/fxfa/parser/xfa_object_imp.cpp4
-rw-r--r--xfa/src/fxfa/parser/xfa_parser_imp.cpp2
17 files changed, 22 insertions, 22 deletions
diff --git a/xfa/src/fxfa/app/xfa_checksum.cpp b/xfa/src/fxfa/app/xfa_checksum.cpp
index 781a30f798..3df37cf156 100644
--- a/xfa/src/fxfa/app/xfa_checksum.cpp
+++ b/xfa/src/fxfa/app/xfa_checksum.cpp
@@ -7,7 +7,7 @@
#include "xfa/src/fxfa/app/xfa_checksum.h"
#include "core/include/fdrm/fx_crypt.h"
-#include "xfa/src/fgas/include/fx_alg.h"
+#include "xfa/src/fgas/crt/fgas_algorithm.h"
CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext)
: m_pContext(pContext) {
diff --git a/xfa/src/fxfa/app/xfa_checksum.h b/xfa/src/fxfa/app/xfa_checksum.h
index a02ef311c6..fb004d37c1 100644
--- a/xfa/src/fxfa/app/xfa_checksum.h
+++ b/xfa/src/fxfa/app/xfa_checksum.h
@@ -8,7 +8,7 @@
#define XFA_SRC_FXFA_APP_XFA_CHECKSUM_H_
#include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fgas/include/fx_sax.h"
+#include "xfa/src/fgas/xml/fgas_sax.h"
class CXFA_SAXReaderHandler;
class CXFA_ChecksumContext;
diff --git a/xfa/src/fxfa/app/xfa_ffapp.h b/xfa/src/fxfa/app/xfa_ffapp.h
index 4d4332aa5e..fc4b5e713d 100644
--- a/xfa/src/fxfa/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/app/xfa_ffapp.h
@@ -12,7 +12,7 @@
#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fgas/include/fx_fnt.h"
+#include "xfa/src/fgas/font/fgas_font.h"
class CXFA_FWLAdapterWidgetMgr;
class CXFA_FWLTheme;
diff --git a/xfa/src/fxfa/app/xfa_ffdoc.cpp b/xfa/src/fxfa/app/xfa_ffdoc.cpp
index 1c277aad9d..78bb809b27 100644
--- a/xfa/src/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/app/xfa_ffdoc.cpp
@@ -10,7 +10,7 @@
#include "core/include/fpdfdoc/fpdf_doc.h"
#include "core/include/fxcrt/fx_ext.h"
#include "xfa/include/fwl/core/fwl_note.h"
-#include "xfa/src/fgas/include/fx_alg.h"
+#include "xfa/src/fgas/crt/fgas_algorithm.h"
#include "xfa/src/fxfa/app/xfa_ffapp.h"
#include "xfa/src/fxfa/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/app/xfa_ffnotify.h"
diff --git a/xfa/src/fxfa/app/xfa_fontmgr.h b/xfa/src/fxfa/app/xfa_fontmgr.h
index b8fa4ae31c..be3f7a74d8 100644
--- a/xfa/src/fxfa/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/app/xfa_fontmgr.h
@@ -12,7 +12,7 @@
#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxcrt/fx_system.h"
#include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fgas/include/fx_fnt.h"
+#include "xfa/src/fgas/font/fgas_font.h"
struct XFA_FONTINFO {
FX_DWORD dwFontNameHash;
diff --git a/xfa/src/fxfa/app/xfa_fwltheme.cpp b/xfa/src/fxfa/app/xfa_fwltheme.cpp
index a97412cf0e..a56aa60628 100644
--- a/xfa/src/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/app/xfa_fwltheme.cpp
@@ -18,7 +18,7 @@
#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/crt/fgas_codepage.h"
#include "xfa/src/fxfa/app/xfa_ffapp.h"
#include "xfa/src/fxfa/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.cpp b/xfa/src/fxfa/app/xfa_textlayout.cpp
index 0ccb4e99d3..b59e8aac82 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/app/xfa_textlayout.cpp
@@ -10,8 +10,8 @@
#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fdp/include/fde_pen.h"
-#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/crt/fgas_algorithm.h"
+#include "xfa/src/fgas/crt/fgas_codepage.h"
#include "xfa/src/fxfa/app/xfa_ffapp.h"
#include "xfa/src/fxfa/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/app/xfa_fontmgr.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.h b/xfa/src/fxfa/app/xfa_textlayout.h
index c4ad1e138b..90d33737eb 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/app/xfa_textlayout.h
@@ -10,7 +10,7 @@
#include "xfa/src/fdp/include/fde_brs.h"
#include "xfa/src/fdp/include/fde_css.h"
#include "xfa/src/fdp/include/fde_rdv.h"
-#include "xfa/src/fgas/include/fx_rbk.h"
+#include "xfa/src/fgas/layout/fgas_rtfbreak.h"
#include "xfa/src/fxfa/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/parser/xfa_object.h"
diff --git a/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp
index 2af975f888..c27223ac5c 100644
--- a/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -9,7 +9,7 @@
#include <time.h>
#include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fgas/include/fx_locale.h"
+#include "xfa/src/fgas/localization/fgas_locale.h"
#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/src/fxfa/parser/xfa_document.h"
#include "xfa/src/fxfa/parser/xfa_localevalue.h"
diff --git a/xfa/src/fxfa/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/parser/xfa_basic_imp.cpp
index dc4c8d1778..a0aa56d8be 100644
--- a/xfa/src/fxfa/parser/xfa_basic_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_basic_imp.cpp
@@ -7,9 +7,9 @@
#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
#include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/include/fx_sys.h"
+#include "xfa/src/fgas/crt/fgas_algorithm.h"
+#include "xfa/src/fgas/crt/fgas_codepage.h"
+#include "xfa/src/fgas/crt/fgas_system.h"
#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/src/fxfa/parser/xfa_basic_data.h"
#include "xfa/src/fxfa/parser/xfa_docdata.h"
diff --git a/xfa/src/fxfa/parser/xfa_basic_imp.h b/xfa/src/fxfa/parser/xfa_basic_imp.h
index 55b3c1d4cb..562cf15909 100644
--- a/xfa/src/fxfa/parser/xfa_basic_imp.h
+++ b/xfa/src/fxfa/parser/xfa_basic_imp.h
@@ -8,7 +8,7 @@
#define XFA_SRC_FXFA_PARSER_XFA_BASIC_IMP_H_
#include "xfa/include/fxfa/fxfa_basic.h"
-#include "xfa/src/fgas/include/fx_stm.h"
+#include "xfa/src/fgas/crt/fgas_stream.h"
struct XFA_NOTSUREATTRIBUTE {
XFA_ELEMENT eElement;
diff --git a/xfa/src/fxfa/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/parser/xfa_document_serialize.cpp
index 53f93f5f71..66a9b75e0c 100644
--- a/xfa/src/fxfa/parser/xfa_document_serialize.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_serialize.cpp
@@ -6,7 +6,7 @@
#include "xfa/src/fxfa/parser/xfa_document_serialize.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/crt/fgas_codepage.h"
#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/src/fxfa/parser/xfa_docdata.h"
#include "xfa/src/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp
index 16fe2da8ac..cdf327826b 100644
--- a/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <memory>
-#include "xfa/src/fgas/include/fx_alg.h"
+#include "xfa/src/fgas/crt/fgas_algorithm.h"
#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/src/fxfa/parser/xfa_docdata.h"
#include "xfa/src/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/src/fxfa/parser/xfa_locale.h b/xfa/src/fxfa/parser/xfa_locale.h
index 07953f290d..f4b128e67e 100644
--- a/xfa/src/fxfa/parser/xfa_locale.h
+++ b/xfa/src/fxfa/parser/xfa_locale.h
@@ -7,7 +7,7 @@
#ifndef XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_
#define XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_
-#include "xfa/src/fgas/include/fx_locale.h"
+#include "xfa/src/fgas/localization/fgas_locale.h"
#include "xfa/src/fxfa/parser/xfa_object.h"
class CXFA_XMLLocale : public IFX_Locale {
diff --git a/xfa/src/fxfa/parser/xfa_localemgr.h b/xfa/src/fxfa/parser/xfa_localemgr.h
index c76674c969..0af6f5f2d3 100644
--- a/xfa/src/fxfa/parser/xfa_localemgr.h
+++ b/xfa/src/fxfa/parser/xfa_localemgr.h
@@ -8,8 +8,8 @@
#define XFA_SRC_FXFA_PARSER_XFA_LOCALEMGR_H_
#include "xfa/include/fxfa/fxfa_objectacc.h"
-#include "xfa/src/fgas/include/fx_datetime.h"
-#include "xfa/src/fgas/include/fx_locale.h"
+#include "xfa/src/fgas/localization/fgas_datetime.h"
+#include "xfa/src/fgas/localization/fgas_locale.h"
#include "xfa/src/fxfa/parser/xfa_localemgr.h"
class CXFA_Node;
diff --git a/xfa/src/fxfa/parser/xfa_object_imp.cpp b/xfa/src/fxfa/parser/xfa_object_imp.cpp
index f2cea35ff4..23b0644074 100644
--- a/xfa/src/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_object_imp.cpp
@@ -7,8 +7,8 @@
#include "xfa/src/fxfa/parser/xfa_object.h"
#include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/include/fx_sys.h"
+#include "xfa/src/fgas/crt/fgas_codepage.h"
+#include "xfa/src/fgas/crt/fgas_system.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"
diff --git a/xfa/src/fxfa/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/parser/xfa_parser_imp.cpp
index fe90f004b2..a3d4f94089 100644
--- a/xfa/src/fxfa/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_parser_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/src/fxfa/parser/xfa_parser_imp.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/crt/fgas_codepage.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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 10:48:46 +0000