diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-22 13:04:17 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-22 13:04:17 -0500 |
| commit | 04d02dbdd511aed4ddd61d8648edc633a0fb8c43 (patch) | |
| tree | 23c45c573096dbb58ca67c4c296d7c5aee579514 /xfa/src/fxfa | |
| parent | 22d6607d104d4cb8c5263c4d307b4ba1e4ff959e (diff) | |
| download | pdfium-04d02dbdd511aed4ddd61d8648edc633a0fb8c43.tar.xz | |
Expand XFA includes to be relative to pdfium/.
This Cl updates the includes in the XFA directory to be relative to the
pdfium/ directory instead of the current directory.
This does not sort the includes as that is a larger IWYU task that will be
handled separately.
BUG=pdfium:65
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1723533002 .
Diffstat (limited to 'xfa/src/fxfa')
65 files changed, 300 insertions, 296 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index a62f8a4b40..9ec9223986 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -6,7 +6,7 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_checksum.h" +#include "xfa/src/fxfa/src/app/xfa_checksum.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { FXSYS_assert(m_pContext); diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp index b88c05973e..1b10c3ab63 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -6,7 +6,7 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode) : m_pNode(pNode), m_pPsMapNode(NULL) {} CXFA_FFConfigAcc::~CXFA_FFConfigAcc() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index e153d956c5..e487c5d9cf 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -8,13 +8,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffdochandler.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" -#include "xfa_fwltheme.h" -#include "xfa_fontmgr.h" -#include "xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) { int32_t iCount = streams.GetSize(); diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index 952e7f5648..4abb20d6d0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" static XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( const CFX_WideStringC& wsName); CXFA_FFBarcode::CXFA_FFBarcode(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index d18b84aff8..2824086f8a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -6,14 +6,14 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffdocview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) { diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 270ea86174..49c262af1a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdocview.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index 513098c7a9..9611a945e6 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffnotify.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider) : m_pDocProvider(pDocProvider), m_pDocument(nullptr), diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index 3bb4bfdc58..db2e840f0a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -6,8 +6,8 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffdochandler.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} CXFA_FFDocHandler::~CXFA_FFDocHandler() {} void CXFA_FFDocHandler::ReleaseDoc(IXFA_Doc* hDoc) { diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index 9d8e049787..bf382c156a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -6,29 +6,29 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffdoc.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_ffpath.h" -#include "xfa_ffimage.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffsubform.h" -#include "xfa_ffsignature.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = { XFA_ATTRIBUTEENUM_Click, XFA_ATTRIBUTEENUM_Change, XFA_ATTRIBUTEENUM_DocClose, XFA_ATTRIBUTEENUM_DocReady, diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h index 511302119d..6aec6a4ecc 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.h +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" class CXFA_FFPageView; class CXFA_FFWidgetHandler; diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index 61e294ea05..3de0dd8656 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} CXFA_FFDraw::~CXFA_FFDraw() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index 716842f3fb..b634a69b5e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index e21b5fd260..c3331f2870 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -6,14 +6,14 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_fwltheme.h" -#include "xfa_textlayout.h" -#include "xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) { m_rtUI.Set(0, 0, 0, 0); diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 61affae6d2..1a79b32b06 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffimage.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFImage::~CXFA_FFImage() { diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index e3329a9869..8cc99a5ca4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffimageedit.h" -#include "xfa_ffdocview.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index ebd9d06a6e..03ab097276 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -6,30 +6,30 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffdoc.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_ffpath.h" -#include "xfa_ffimage.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffsubform.h" -#include "xfa_ffsignature.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index aa108a2625..2fa2b3f4ec 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -6,17 +6,17 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) : CXFA_ContainerLayoutItem(pPageArea), m_pDocView(pDocView), diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index 8217af29a7..fd6947a8b0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffpath.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFLine::~CXFA_FFLine() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index 2b9f1eeb95..12c1a2a30d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffpushbutton.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 1dc7ed68b5..138036c01c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffsignature.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index c4280b6087..97b37c32c7 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffsubform.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index 854c72175a..a7630aca2d 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_textlayout.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFText::~CXFA_FFText() {} diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index 2d2177b670..cab1c0d782 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -6,15 +6,15 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_fftextedit.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" -#include "xfa_ffdocview.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 0af2ede0e6..4e31a27ca5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -8,12 +8,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffpageview.h" -#include "xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_ContentLayoutItem(pDataAcc->GetNode()), diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 04123588b4..f3c8e15c1f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -8,18 +8,18 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_fwladapter.h" -#include "xfa_fffield.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { delete ((CXFA_CalcData*)pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h index 7a8dd94bfe..6768502a9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ -#include "xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" enum XFA_TEXTPROVIDERTYPE { XFA_TEXTPROVIDERTYPE_Text, diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 6d3af0ec37..6b718526a9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView) : m_pDocView(pDocView) {} CXFA_FFWidgetHandler::~CXFA_FFWidgetHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 57061deb1f..7bc8029f46 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -8,10 +8,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fontmgr.h" -#include "xfa_ffdoc.h" -#include "xfa_ffConfigAcc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { {0x01d5d33e, L"SimSun", L"Arial", 0, 936}, diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index 517c491a0e..2ef612516f 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -6,10 +6,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {} FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 69b9e5f481..1d061567d5 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -6,9 +6,9 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwltheme.h" -#include "xfa_ffwidget.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) { IFWL_Widget* pOuter = pWidget; while (pOuter->GetOuter()) { diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 8a8aeb63b2..d658e8dd36 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -6,8 +6,8 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_rendercontext.h" -#include "xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 IXFA_RenderContext* XFA_RenderContext_Create() { return new CXFA_RenderContext; diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 8cef856224..637e7b848a 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -8,10 +8,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); while (pos) { diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index 269cab605e..ce7f4d211c 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -9,14 +9,14 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ -#include "xfa_utils.h" -#include "xfa_object.h" -#include "xfa_document.h" -#include "xfa_parser.h" -#include "xfa_script.h" -#include "xfa_docdata.h" -#include "xfa_doclayout.h" -#include "xfa_localemgr.h" -#include "xfa_fm2jsapi.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" #endif // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index 4ebc59b4fa..14ea7e5e65 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ +#include "xfa/src/fxfa/src/common/fxfa_localevalue.h" + FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier( IFDE_XMLElement* pNode, const CFX_WideStringC& wsQualifier, @@ -185,7 +187,7 @@ class CXFA_PtrSetTemplate : private CFX_MapPtrToPtr { }; class CXFA_Node; class CXFA_WidgetData; -#include "fxfa_localevalue.h" + CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType); CXFA_LocaleValue XFA_GetLocaleValue(CXFA_WidgetData* pWidgetData); CFX_WideString XFA_NumericLimit(const CFX_WideString& wsValue, diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.cpp b/xfa/src/fxfa/src/fm2js/xfa_error.cpp index 4bcf3b2398..a7d061f1e9 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_error.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static const FX_WCHAR* gs_lpStrErrorMsgInfo[] = { L"unsupported char '%c'", L"bad suffix on number", L"invalidate char '%c'", L"expected identifier instead of '%s'", diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp b/xfa/src/fxfa/src/fm2js/xfa_expression.cpp index eff1eba3d8..95bd809bad 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static CFX_WideStringC RUNTIMEBLOCKTEMPARRAY = FX_WSTRC(L"foxit_xfa_formcalc_runtime_block_temp_array"); static CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX = diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index cb10391517..998a5627e0 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -22,12 +22,12 @@ #define EXCLAMATION_IN_IDENTIFIER \ (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray; -#include "xfa_error.h" -#include "xfa_lexer.h" -#include "xfa_simpleexpression.h" -#include "xfa_expression.h" -#include "xfa_fmparse.h" -#include "xfa_program.h" -#include "xfa_fm2jscontext.h" +#include "xfa/src/fxfa/src/fm2js/xfa_error.h" +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" +#include "xfa/src/fxfa/src/fm2js/xfa_expression.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h" +#include "xfa/src/fxfa/src/fm2js/xfa_program.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h" #endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp index f9759a8ba9..4aa39d8f09 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index 77cf79bd7b..15d9531d8b 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" #include <time.h> + +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" + #define FINANCIAL_PRECISION 0.00000001 struct XFA_FMHtmlReserveCode { uint32_t m_uCode; diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp index 105c5144ca..c8eb962325 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" CXFA_FMParse::CXFA_FMParse() : m_pToken(nullptr), m_pErrorInfo(0) {} diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp index 2902f8c70b..b4af01f0c0 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" namespace { diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.cpp b/xfa/src/fxfa/src/fm2js/xfa_program.cpp index b3aa475093..03462d2f01 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_program.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_program.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" CXFA_FMProgram::CXFA_FMProgram() : m_globalFunction(0) {} CXFA_FMProgram::~CXFA_FMProgram() { if (m_globalFunction != 0) { diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp index 7048c38d5a..b0ce3ad4ca 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static CFX_WideStringC gs_lpStrExpFuncName[] = { FX_WSTRC(L"foxit_xfa_formcalc_runtime.assign_value_operator"), FX_WSTRC(L"foxit_xfa_formcalc_runtime.logical_or_operator"), diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 4216c25a14..6ee9259ceb 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -14,13 +14,13 @@ #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" -#include "xfa_script_hostpseudomodel.h" -#include "xfa_script_logpseudomodel.h" -#include "xfa_script_layoutpseudomodel.h" -#include "xfa_script_signaturepseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, {0x2f, L"/", XFA_ATTRIBUTEENUM_Slash}, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index f06daa4021..83449b9f1f 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -14,7 +14,7 @@ #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/src/fxfa/src/parser/xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[]; 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 5bf63449f7..37b5cc070a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -14,10 +14,10 @@ #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_datadescription_imp.h" -#include "xfa_document_datamerger_imp.h" -#include "xfa_document_layout_imp.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, diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 6b7a0350e6..f010920685 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -14,14 +14,14 @@ #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" -#include "xfa_script_eventpseudomodel.h" -#include "xfa_script_hostpseudomodel.h" -#include "xfa_script_logpseudomodel.h" -#include "xfa_script_layoutpseudomodel.h" -#include "xfa_script_signaturepseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CXFA_Document::CXFA_Document(IXFA_DocParser* pParser) : m_pParser(pParser), m_pScriptContext(nullptr), 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 1c47ccb009..179e85ce22 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -14,12 +14,12 @@ #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_document_datamerger_imp.h" -#include "xfa_layout_itemlayout.h" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() { if (!m_pLayoutProcessor) { m_pLayoutProcessor = new CXFA_LayoutProcessor(this); diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index bba10ba74e..6624bc338f 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/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 855483bbae..5b4f87a693 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -14,10 +14,10 @@ #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" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) { FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable; CFX_WideStringC wsRelevant; diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 6f2a5010a1..7e17b77213 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -17,10 +17,10 @@ #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" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode, CXFA_LayoutPageMgr* pPageMgr) : m_bKeepBreakFinish(FALSE), 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 5f30d75ad4..832e1ba5d1 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -14,11 +14,11 @@ #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" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor) : m_pLayoutProcessor(pLayoutProcessor), m_pTemplatePageSetRoot(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index b67a158f80..91e6dac2b7 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -15,7 +15,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index 82091e8f2e..fae2753b61 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -15,7 +15,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_locale.h" const uint8_t g_enUS_Locale[] = { 0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0x9B, 0x30, 0x14, 0x7D, 0x9F, 0xB4, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 278ad85324..5329a358bd 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -14,8 +14,8 @@ #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/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) : m_pDocument(pDocument), m_uFlags(uFlags) {} void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 01b12d5cae..a2c05044a8 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -14,8 +14,8 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, FX_BOOL bDocumentParser) { return new CXFA_SimpleParser(pFactory, bDocumentParser); diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index d81c558102..03fbaf8b26 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { m_uScriptHash = XFA_HASHCODE_DataWindow; diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index 0c2fb8b6b0..b5c5f0126d 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { m_uScriptHash = XFA_HASHCODE_Event; diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index ee42d5a4fc..9f65c52d3e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { m_uScriptHash = XFA_HASHCODE_Host; diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index 4b808a4739..f5c1673460 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -14,9 +14,9 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument) : m_pDocument(pDocument), m_hJsContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index d2a9212b05..fdeb0de167 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -14,9 +14,9 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) { m_uScriptHash = XFA_HASHCODE_Layout; diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index fe1d9bc0c4..94c0f0b3a7 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { m_uScriptHash = XFA_HASHCODE_Log; diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 7ef7382f69..f5e5b726f7 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -14,8 +14,8 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" CXFA_NodeHelper::CXFA_NodeHelper(void) : m_eLastCreateType(XFA_ELEMENT_DataValue), m_pCreateParent(NULL), diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index 6df0866a0b..d54846fc29 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -14,9 +14,9 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" CXFA_ResolveProcessor::CXFA_ResolveProcessor(void) : m_pNodeHelper(NULL), m_iCurStart(0) { m_pNodeHelper = new CXFA_NodeHelper; diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index b0f112ae90..68dbc16b9b 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -14,7 +14,7 @@ #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" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_SignaturePseudoModel) { |