diff options
Diffstat (limited to 'xfa/src/fxfa/src/app')
41 files changed, 179 insertions, 155 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 9ec9223986..4a4168f40b 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_checksum.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 1b10c3ab63..7bbcb02abb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 e487c5d9cf..be3a38be52 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -7,14 +7,14 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.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" +#include "xfa/src/fxfa/src/common/xfa_common.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 4abb20d6d0..72a9e6dfa5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffbarcode.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" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h index 58826869b5..5fac3e232d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h @@ -7,7 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ -class CXFA_FFTextEdit; +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" + class CXFA_FFBarcode : public CXFA_FFTextEdit { public: CXFA_FFBarcode(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -21,6 +23,7 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit { virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); }; + enum XFA_BARCODETYPEENUM { XFA_BARCODETYPE_aztec, XFA_BARCODETYPE_codabar, diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index 2824086f8a..b3d18efa33 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffcheckbutton.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_ffexclgroup.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_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h index 38b0184384..3a41d3ae06 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" + class CXFA_FFExclGroup; class CXFA_FFCheckButton : public CXFA_FFField { public: diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 49c262af1a..9954adde9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#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_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffchoicelist.h b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h index 3646dc826f..ef2de65ab4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" + class CXFA_FFListBox : public CXFA_FFField { public: CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index 9611a945e6..3e3549d8f9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index e2e5bec9ef..5d83efbd80 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -8,6 +8,7 @@ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_ #include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" class CXFA_FFApp; class CXFA_FFNotify; diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index db2e840f0a..35fc20bc02 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 bf382c156a..2ad07dbcac 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -5,30 +5,30 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.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_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.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_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.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_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.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_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index 3de0dd8656..1989ff9761 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#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_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffdraw.h b/xfa/src/fxfa/src/app/xfa_ffdraw.h index fba7d4ed8a..24862e5180 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.h +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.h @@ -7,12 +7,13 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFDraw : public CXFA_FFWidget { public: CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFDraw(); - - protected: }; #endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index b634a69b5e..8176ddd38e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#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_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h index 2b6d39216e..b67b355ffc 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFExclGroup : public CXFA_FFWidget { public: CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -16,8 +19,6 @@ class CXFA_FFExclGroup : public CXFA_FFWidget { CFX_Matrix* pMatrix = NULL, FX_DWORD dwStatus = 0, int32_t iRotate = 0); - - protected: }; #endif // XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index c3331f2870..47140a0c6d 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffdocview.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_ffwidget.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" +#include "xfa/src/fxfa/src/common/xfa_common.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_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h index eb4bd0348c..e168b147ce 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.h +++ b/xfa/src/fxfa/src/app/xfa_fffield.h @@ -7,8 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + #define XFA_MINUI_HEIGHT 4.32f #define XFA_DEFAULTUI_HEIGHT 2.0f + class CXFA_TextLayout; class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { public: diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 1a79b32b06..947bad6881 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.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_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" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 8cc99a5ca4..59a84820c2 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_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" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 03ab097276..fa85760651 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -5,31 +5,31 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.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_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.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_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.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_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.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_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 2fa2b3f4ec..2601ffa004 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -5,18 +5,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffcheckbutton.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" #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_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" #include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.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_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h index 6d1926ea12..6ee2e140fb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.h +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" + class CXFA_FFWidget; class CXFA_FFDocView; class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView { diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index fd6947a8b0..c1fb273431 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.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_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" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 12c1a2a30d..bd5656f5f3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffapp.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_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 138036c01c..905906296b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_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" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 97b37c32c7..9e826f241b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.h b/xfa/src/fxfa/src/app/xfa_ffsubform.h index ae548cca7d..11c1123b08 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.h +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFSubForm : public CXFA_FFWidget { public: CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index a7630aca2d..126d47d64b 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.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_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.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" +#include "xfa/src/fxfa/src/common/xfa_common.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 cab1c0d782..2e84c39e6a 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -5,16 +5,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_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_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_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.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" +#include "xfa/src/fxfa/src/common/xfa_common.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_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h index e6c11ca610..638d506ae3 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.h +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" + class CXFA_FFTextEdit : public CXFA_FFField { public: CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 4e31a27ca5..c93e945071 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -7,13 +7,13 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_ContentLayoutItem(pDataAcc->GetNode()), diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 7b373b25e4..2928adfb16 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -10,6 +10,7 @@ #include <vector> #include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" class CXFA_FFPageView; class CXFA_FFDocView; diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index f3c8e15c1f..8a6aab2692 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -7,19 +7,19 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.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_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_ffpageview.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_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { delete ((CXFA_CalcData*)pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 6b718526a9..21d3476392 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 7bc8029f46..f42eca6d94 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -7,11 +7,11 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 2ef612516f..f176434554 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 1d061567d5..fa9b92e808 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 d658e8dd36..88713f9b4b 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" +#include "xfa/src/fxfa/src/common/xfa_common.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 b6eb986f4c..629b7f15a6 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -7,11 +7,11 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.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" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); while (pos) { |