diff options
Diffstat (limited to 'xfa/src/fxfa/src/app')
32 files changed, 209 insertions, 209 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) { |