From 880962cb81b7a34e4b90a2ecb1992f1afb13d529 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 23 Feb 2016 09:09:24 -0500 Subject: Sort includes in xfa/. This CL sorts all the includes in the xfa/ directory. There are a lot of IWYU errors that have been fixed to make things compile again. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1722803002 . --- xfa/src/fxfa/src/app/xfa_checksum.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffapp.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_ffbarcode.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffbarcode.h | 5 ++- xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp | 14 ++++---- xfa/src/fxfa/src/app/xfa_ffcheckbutton.h | 3 ++ xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp | 12 +++---- xfa/src/fxfa/src/app/xfa_ffchoicelist.h | 3 ++ xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 4 +-- xfa/src/fxfa/src/app/xfa_ffdoc.h | 1 + xfa/src/fxfa/src/app/xfa_ffdochandler.cpp | 4 +-- xfa/src/fxfa/src/app/xfa_ffdocview.cpp | 36 ++++++++++---------- xfa/src/fxfa/src/app/xfa_ffdraw.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffdraw.h | 5 +-- xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffexclgroup.h | 5 +-- xfa/src/fxfa/src/app/xfa_fffield.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_fffield.h | 4 +++ xfa/src/fxfa/src/app/xfa_ffimage.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_ffnotify.cpp | 38 +++++++++++----------- xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 14 ++++---- xfa/src/fxfa/src/app/xfa_ffpageview.h | 2 ++ xfa/src/fxfa/src/app/xfa_ffpath.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffsignature.cpp | 6 ++-- xfa/src/fxfa/src/app/xfa_ffsubform.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_ffsubform.h | 3 ++ xfa/src/fxfa/src/app/xfa_fftext.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_fftextedit.cpp | 12 +++---- xfa/src/fxfa/src/app/xfa_fftextedit.h | 2 ++ xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 4 +-- xfa/src/fxfa/src/app/xfa_ffwidget.h | 1 + xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 16 ++++----- xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp | 10 +++--- xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 6 ++-- xfa/src/fxfa/src/app/xfa_fwladapter.cpp | 8 ++--- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 6 ++-- xfa/src/fxfa/src/app/xfa_rendercontext.cpp | 4 +-- xfa/src/fxfa/src/app/xfa_textlayout.cpp | 4 +-- xfa/src/fxfa/src/common/xfa_common.h | 12 +++---- xfa/src/fxfa/src/common/xfa_docdata.h | 3 ++ xfa/src/fxfa/src/common/xfa_doclayout.h | 3 ++ xfa/src/fxfa/src/common/xfa_document.h | 4 +++ xfa/src/fxfa/src/common/xfa_object.h | 2 ++ xfa/src/fxfa/src/fm2js/xfa_expression.h | 2 ++ xfa/src/fxfa/src/fm2js/xfa_fm2js.h | 28 ++++++++-------- xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h | 2 ++ xfa/src/fxfa/src/parser/xfa_basic_data.cpp | 14 ++++---- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 12 +++---- .../parser/xfa_document_datadescription_imp.cpp | 12 +++---- .../src/parser/xfa_document_datamerger_imp.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 14 ++++---- .../fxfa/src/parser/xfa_document_layout_imp.cpp | 16 ++++----- xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp | 14 ++++---- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 14 ++++---- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 14 ++++---- xfa/src/fxfa/src/parser/xfa_locale.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_localevalue.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp | 12 +++---- .../src/parser/xfa_script_eventpseudomodel.cpp | 12 +++---- .../fxfa/src/parser/xfa_script_hostpseudomodel.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 14 ++++---- .../src/parser/xfa_script_layoutpseudomodel.cpp | 14 ++++---- .../fxfa/src/parser/xfa_script_logpseudomodel.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp | 14 ++++---- .../src/parser/xfa_script_resolveprocessor.cpp | 16 ++++----- .../src/parser/xfa_script_signaturepseudomodel.cpp | 12 +++---- xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 12 +++---- 75 files changed, 383 insertions(+), 343 deletions(-) (limited to 'xfa/src/fxfa') 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 #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& 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(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 #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 #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 #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 #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 #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) { diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index ce7f4d211c..17948d193b 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/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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #endif // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h index b1b78eba6f..2c23d96b70 100644 --- a/xfa/src/fxfa/src/common/xfa_docdata.h +++ b/xfa/src/fxfa/src/common/xfa_docdata.h @@ -7,9 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" + enum XFA_DATAFORMAT { XFA_DATAFORMAT_XDP, }; + class IXFA_PacketExport { public: static IXFA_PacketExport* Create(CXFA_Document* pDocument, diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h index 5ac4cb945f..7460b7ba13 100644 --- a/xfa/src/fxfa/src/common/xfa_doclayout.h +++ b/xfa/src/fxfa/src/common/xfa_doclayout.h @@ -7,10 +7,13 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" + #define _XFA_LAYOUTITEM_ProcessCACHE_ class CXFA_ContainerLayoutItem; class CXFA_ContentLayoutItem; +class IXFA_DocLayout; class IXFA_LayoutPage { public: diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index 5498b1f831..1978a619b2 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CXFA_Document; class CXFA_LayoutItem; class CXFA_LayoutProcessor; @@ -64,6 +67,7 @@ enum XFA_LAYOUTRESULT { }; #define XFA_LAYOUTNOTIFY_StrictHeight 0x0001 #define XFA_LAYOUTNOTIFY_NoParentBreak 0x0002 + class IXFA_Notify { public: virtual ~IXFA_Notify() {} diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h index a565922157..54b77c013a 100644 --- a/xfa/src/fxfa/src/common/xfa_object.h +++ b/xfa/src/fxfa/src/common/xfa_object.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ +#include "xfa/src/fxfa/src/common/xfa_utils.h" + class CXFA_ArrayNodeList; class CXFA_AttachNodeList; class CXFA_Document; diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index a3464a2d13..f70ee60e5f 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" + enum XFA_FM_EXPTYPE { XFA_FM_EXPTYPE_UNKNOWN, XFA_FM_EXPTYPE_FUNC, diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index 998a5627e0..e0356d119a 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -8,26 +8,26 @@ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#define RUNTIMEFUNCTIONRETURNVALUE \ - (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) -#define EXCLAMATION_IN_IDENTIFIER \ - (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) -typedef CFX_ArrayTemplate CFX_WideStringCArray; +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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_fm2jscontext.h" #include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h" +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" #include "xfa/src/fxfa/src/fm2js/xfa_program.h" -#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h" +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" + +#define RUNTIMEFUNCTIONRETURNVALUE \ + (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) +#define EXCLAMATION_IN_IDENTIFIER \ + (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) #endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h index 4412cbd248..f474004300 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" + enum XFA_FM_SimpleExpressionType { ASSIGN, LOGICALOR, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 6ee9259ceb..cfae869f3d 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -5,21 +5,21 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 83449b9f1f..3c32811bbd 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp index 5c3682ef1b..2a6146ba21 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #define XFA_HASHCODE_Group 0xf7f75fcd class CXFA_TraverseStrategy_DDGroup { public: diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 37b5cc070a..a9c12522a5 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index f010920685..8980ad9535 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -5,22 +5,22 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CXFA_Document::CXFA_Document(IXFA_DocParser* pParser) : m_pParser(pParser), 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 179e85ce22..71fc72ce5a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -5,21 +5,21 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.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 6624bc338f..bbcf8d27c4 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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 5b4f87a693..7653410c14 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -5,19 +5,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.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 071fe4d40f..549b116ed8 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -8,19 +8,19 @@ #include #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.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 4030326964..4dbfcbc2a9 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -5,20 +5,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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_appadapter.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 91e6dac2b7..f75853a418 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -6,15 +6,15 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index fae2753b61..a3567b802a 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -6,15 +6,15 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_locale.h" const uint8_t g_enUS_Locale[] = { diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 1bc82b5f47..99ff2e94d0 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" static const FX_DOUBLE fraction_scales[] = {0.1, 0.01, 0.001, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 8c820fcb99..f3f2836ea7 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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) diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 9261a77ed7..449c1b84fa 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) { uint8_t r = 0, g = 0, b = 0; if (wsValue.GetLength() == 0) { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index a2c05044a8..94a3739fb1 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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, diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index 03fbaf8b26..26b3616a3e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index b5c5f0126d..99fe7c255e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index 9f65c52d3e..b495a774bc 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index 6897acf785..1c913cceae 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.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" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.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 fdeb0de167..5cf43af336 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" #include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.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 94c0f0b3a7..be69240508 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index f5e5b726f7..1107091180 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -5,17 +5,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.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 d54846fc29..dcdbc8b83c 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.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/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.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 68dbc16b9b..0b22dc3b61 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index 2f20d2c22a..ec17992e9c 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.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_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_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.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_utils.h" CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) { XFA_ELEMENT eType = pNode->GetClassID(); eWidgetType = eType; -- cgit v1.2.3