diff options
184 files changed, 307 insertions, 252 deletions
@@ -773,7 +773,6 @@ if (pdf_enable_xfa) { static_library("xfa") { sources = [ - "xfa/include/foxitxfa.h", "xfa/include/fwl/adapter/fwl_adapternative.h", "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h", "xfa/include/fwl/adapter/fwl_adaptertimermgr.h", @@ -941,7 +940,6 @@ if (pdf_enable_xfa) { "xfa/src/fgas/src/localization/fx_localemgr.h", "xfa/src/fgas/src/xml/fx_sax_imp.cpp", "xfa/src/fgas/src/xml/fx_sax_imp.h", - "xfa/src/foxitlib.h", "xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp", "xfa/src/fwl/src/basewidget/fwl_caretimp.cpp", "xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp", diff --git a/testing/libfuzzer/pdf_xml_fuzzer.cc b/testing/libfuzzer/pdf_xml_fuzzer.cc index 3e8e18a4dc..dc3eb8c328 100644 --- a/testing/libfuzzer/pdf_xml_fuzzer.cc +++ b/testing/libfuzzer/pdf_xml_fuzzer.cc @@ -9,7 +9,6 @@ #include "core/include/fxcrt/fx_basic.h" #include "core/include/fxcrt/fx_system.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_parser.h" #include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" @@ -22,7 +22,6 @@ 'FT2_BUILD_LIBRARY', ], "sources":[ - "xfa/include/foxitxfa.h", "xfa/include/fwl/adapter/fwl_adapternative.h", "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h", "xfa/include/fwl/adapter/fwl_adaptertimermgr.h", @@ -190,7 +189,6 @@ "xfa/src/fgas/src/localization/fx_localemgr.h", "xfa/src/fgas/src/xml/fx_sax_imp.cpp", "xfa/src/fgas/src/xml/fx_sax_imp.h", - "xfa/src/foxitlib.h", "xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp", "xfa/src/fwl/src/basewidget/fwl_caretimp.cpp", "xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp", diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h deleted file mode 100644 index bdb72ed313..0000000000 --- a/xfa/include/foxitxfa.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -// TODO(thestig): Remove this file and do IWYU. - -#ifndef XFA_INCLUDE_FOXITXFA_H_ -#define XFA_INCLUDE_FOXITXFA_H_ - -#include "core/include/fdrm/fx_crypt.h" -#include "core/include/fpdfdoc/fpdf_doc.h" -#include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxge/fx_ge.h" -#include "xfa/include/fxbarcode/BC_BarCode.h" -#include "xfa/include/fxfa/fxfa.h" -#include "xfa/include/fxgraphics/fx_graphics.h" -#include "xfa/include/fxjse/fxjse.h" - -#endif // XFA_INCLUDE_FOXITXFA_H_ diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index 2797dc8f18..c6ef766f7f 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -7,6 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ +#include "xfa/include/fxbarcode/BC_BarCode.h" + class IFX_Barcode { public: virtual ~IFX_Barcode() {} diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fdp/include/fde_pth.h index 41cb367613..8f4cc9aeed 100644 --- a/xfa/src/fdp/include/fde_pth.h +++ b/xfa/src/fdp/include/fde_pth.h @@ -7,7 +7,9 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_PTH_H_ #define XFA_SRC_FDP_INCLUDE_FDE_PTH_H_ -class IFDE_Path; +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" + class IFDE_Path { public: static IFDE_Path* Create(); diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index ca9e552dbf..4a9fb754d3 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/src/css/fde_csscache.h" + #include <algorithm> -#include "xfa/src/fdp/src/css/fde_csscache.h" -#include "xfa/src/foxitlib.h" +#include "core/include/fxcrt/fx_ext.h" FDE_CSSCACHEITEM::FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index 8284ea1b01..5b80d3ef6a 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -6,10 +6,10 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/foxitlib.h" FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 57b36daa82..4eea30c150 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -6,8 +6,8 @@ #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/foxitlib.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index 5f51eb89b6..68bb570769 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/src/css/fde_cssstyleselector.h" + #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" -#include "xfa/src/fdp/src/css/fde_cssstyleselector.h" -#include "xfa/src/foxitlib.h" int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) { int32_t iCount = m_arrCounterData.GetSize(); diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index aad5531de1..15a45c1d8a 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -9,6 +9,11 @@ #include <vector> +#include "core/include/fxcrt/fx_ext.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fdp/src/css/fde_csscache.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.h" +#include "xfa/src/fgas/include/fx_mem.h" #include "xfa/src/fgas/include/fx_sys.h" #define FDE_CSSUNIVERSALHASH ('*') diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index b9ecd500a6..59fd83b7fe 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -9,7 +9,6 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index e2724b2187..0ba7234633 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -8,7 +8,6 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.h" #ifdef _cplusplus extern "C" { diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index 6b0e13971e..fea0d6a4d1 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/src/fde/fde_devbasic.h" + #include <cstdint> -#include "xfa/src/fdp/src/fde/fde_devbasic.h" -#include "xfa/src/foxitlib.h" +#include "xfa/src/fdp/include/fde_brs.h" static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 75201af133..b2be47c659 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -4,12 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/src/fde/fde_gedevice.h" + #include <algorithm> +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_img.h" +#include "xfa/src/fdp/include/fde_pen.h" #include "xfa/src/fdp/src/fde/fde_devbasic.h" -#include "xfa/src/fdp/src/fde/fde_gedevice.h" #include "xfa/src/fdp/src/fde/fde_geobject.h" -#include "xfa/src/foxitlib.h" FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap& hatchMask) { FDE_LPCHATCHDATA pData = FDE_DEVGetHatchData(iHatchStyle); diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index ffe0ff0b9a..7e22691c5b 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fdp/src/fde/fde_geobject.h" + #include "xfa/src/fdp/src/fde/fde_object.h" -#include "xfa/src/foxitlib.h" IFDE_Path* IFDE_Path::Create() { return new CFDE_Path; diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h index a22817f183..aa5847cf8e 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.h +++ b/xfa/src/fdp/src/fde/fde_geobject.h @@ -7,7 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_ -#include "xfa/src/foxitlib.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_pth.h" +#include "xfa/src/fgas/include/fx_mem.h" class CFDE_Path : public IFDE_Path, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index e3134eb679..f79a41a001 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fdp/src/fde/fde_iterator.h" + #include "xfa/src/fgas/include/fx_utl.h" -#include "xfa/src/foxitlib.h" IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index ba058b8179..fc2de2091e 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fdp/src/fde/fde_object.h" -#include "xfa/src/foxitlib.h" + IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); } diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index 10ad622637..58c84b7d2e 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fdp/src/fde/fde_render.h" -#include "xfa/src/foxitlib.h" + void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index 8d54574274..913e3f020c 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fdp/src/tto/fde_textout.h" + #include <algorithm> -#include "xfa/src/fdp/src/tto/fde_textout.h" -#include "xfa/src/foxitlib.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; } diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 6304254feb..91486eb29b 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -10,15 +10,16 @@ #include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/foxitlib.h" #define FDE_XMLVALIDCHARRANGENUM 5 -static FX_WCHAR g_XMLValidCharRange[FDE_XMLVALIDCHARRANGENUM][2] = { + +static const FX_WCHAR g_XMLValidCharRange[FDE_XMLVALIDCHARRANGENUM][2] = { {0x09, 0x09}, {0x0A, 0x0A}, {0x0D, 0x0D}, {0x20, 0xD7FF}, {0xE000, 0xFFFD}}; + FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch) { int32_t iStart = 0, iEnd = FDE_XMLVALIDCHARRANGENUM - 1, iMid; while (iStart <= iEnd) { diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index b05a691c1d..c57fff38c4 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" + #include <algorithm> #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" -#include "xfa/src/foxitlib.h" + #define FDE_DEFCHUNKCOUNT 2 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h index c9f5fc40e1..1be60f8d15 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fgas/include/fx_mem.h" class IFX_CharIter; diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index f8b5444b70..cc5548900a 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" + #include <algorithm> #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" -#include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define FDE_PAGEWIDTH_MAX 0xFFFF #define FDE_TXTPLATESIZE (1024 * 12) diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h index 69390ddd2f..6c80903cf8 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.h +++ b/xfa/src/fee/src/fee/fde_txtedtengine.h @@ -7,10 +7,13 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_ +#include "core/include/fxcrt/fx_string.h" +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" + class IFX_TxtBreak; -class CFDE_TxtEdtParag; class IFX_CharIter; -class CFDE_TxtEdtEngine; +class CFDE_TxtEdtParag; class CFDE_TxtEdtDoRecord_Insert; class CFDE_TxtEdtDoRecord_DeleteRange; @@ -23,6 +26,7 @@ class IFDE_TxtEdtDoRecord { virtual FX_BOOL Undo() = 0; virtual void Serialize(CFX_ByteString& bsDoRecord) const = 0; }; + class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine { friend class CFDE_TxtEdtDoRecord_Insert; friend class CFDE_TxtEdtDoRecord_DeleteRange; @@ -192,6 +196,7 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine { FX_WCHAR m_wLineEnd; FDE_TXTEDT_TEXTCHANGE_INFO m_ChangeInfo; }; + class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_Insert(const CFX_ByteStringC& bsDoRecord); @@ -213,6 +218,7 @@ class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord { int32_t m_nCaret; CFX_WideString m_wsInsert; }; + class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_DeleteRange(const CFX_ByteStringC& bsDoRecord); diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 65cd2ab182..40d0155b45 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fee/src/fee/fde_txtedtpage.h" + #include <algorithm> #include "xfa/src/fee/include/fx_wordbreak.h" @@ -12,10 +14,10 @@ #include "xfa/src/fee/include/ifde_txtedtpage.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" -#include "xfa/src/fee/src/fee/fde_txtedtpage.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/foxitlib.h" + #define FDE_TXTEDT_TOLERANCE 0.1f + IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex) { return (IFDE_TxtEdtPage*)new CFDE_TxtEdtPage(pEngine, nIndex); diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h index 5f04e20611..cc7ff244b7 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.h +++ b/xfa/src/fee/src/fee/fde_txtedtpage.h @@ -7,11 +7,17 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_ -class CFDE_TxtEdtEngine; +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_string.h" +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fee/include/ifde_txtedtpage.h" +#include "xfa/src/fgas/include/fx_utl.h" + class IFX_CharIter; +class CFDE_TxtEdtEngine; class CFDE_TxtEdtPage; -class CFDE_TxtEdtTextSet; class CFDE_TxtEdtParag; + enum FDE_TXTEDT_CHARTYPE { FDE_TXTEDT_CHARTYPE_Unknown = 0, FDE_TXTEDT_CHARTYPE_Tab, @@ -22,6 +28,7 @@ enum FDE_TXTEDT_CHARTYPE { FDE_TXTEDT_CHARTYPE_Char, FDE_TXTEDT_CHARTYPE_CJK, }; + inline FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar) { if (wChar == 0x9) { return FDE_TXTEDT_CHARTYPE_Tab; @@ -87,6 +94,7 @@ class CFDE_TxtEdtTextSet : public IFDE_TextSet { private: CFDE_TxtEdtPage* m_pPage; }; + class CFDE_TxtEdtPage : public IFDE_TxtEdtPage { public: CFDE_TxtEdtPage(IFDE_TxtEdtEngine* pEngine, int32_t nLineIndex); diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index af102969b7..83b2fdd270 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" + #include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" -#include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/foxitlib.h" +#include "xfa/src/fgas/include/fx_tbk.h" + CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), m_nCharCount(0), diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h index 09c4aef2a3..d850f6fe93 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.h +++ b/xfa/src/fee/src/fee/fde_txtedtparag.h @@ -7,12 +7,15 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_ +#include "xfa/src/fee/include/ifde_txtedtengine.h" + class CFDE_TxtEdtEngine; -class CFDE_TxtEdtParag; + class CFDE_TxtEdtParag : public IFDE_TxtEdtParag { public: - CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine); + explicit CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine); ~CFDE_TxtEdtParag(); + virtual int32_t GetTextLength() const { return m_nCharCount; } virtual int32_t GetStartIndex() const { return m_nCharStart; } virtual int32_t CountLines() const { return m_nLineCount; } diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index 421e1a4610..155d1658c6 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -5,7 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" -#include "xfa/src/foxitlib.h" #define FX_IsOdd(a) ((a)&1) diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp index 5596aac7bc..9d4cc5cf94 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" -#include "xfa/src/foxitlib.h" -extern const FX_WORD gs_FX_WordBreak_Table[16] = { + +const FX_WORD gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, 0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB, }; -extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1] = +const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1] = // NOLINTNEXTLINE { 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h deleted file mode 100644 index c30631ce6a..0000000000 --- a/xfa/src/foxitlib.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -// TODO(thestig): Remove this file and do IWYU. - -#ifndef XFA_SRC_FOXITLIB_H_ -#define XFA_SRC_FOXITLIB_H_ - -#include "xfa/include/foxitxfa.h" -#include "xfa/src/fee/include/fx_wordbreak.h" -#include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "xfa/src/fee/include/ifde_txtedtpage.h" - -#endif // XFA_SRC_FOXITLIB_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 159eaf1ba5..839a4bf120 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index cda0efeb15..559d4b69f1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 8240279fc3..2165e20864 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -11,11 +11,11 @@ #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" + #define FWL_CKB_CaptionMargin 5 // static diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 88add897b7..5fafb98d68 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index b5c59f35f6..19b6820dbf 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" #include "xfa/include/fwl/basewidget/fwl_spinbutton.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 39be5aa087..4cbf92ba7b 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -13,7 +13,7 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_rdr.h" #include "xfa/src/fdp/include/fde_rdv.h" -#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/ifde_txtedtpage.h" #include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index d70fd98f62..558866a1b4 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" + #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 1f77f7ad94..f218e709da 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index ada2d6fcc1..b3dea6ee7b 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -11,7 +11,6 @@ #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index ba349af8ba..4bfae5369c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" #include "xfa/include/fwl/lightwidget/picturebox.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 0a0cf816d6..3abb22e2ab 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index 04cdd901cd..16271c93b8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index e3924290ca..5b914afc17 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_spinbutton.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index c55d349f75..d58657b7ab 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index a79a1c1bf4..536d7d6d38 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h" + static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) { switch (type) { case BC_CODE39: diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index a518bc58d0..c14f1859d3 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 482cf12908..df39d39630 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/include/fwl/core/fwl_content.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index 031efd2a28..df2f4db39a 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -11,7 +11,6 @@ #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index b7d255ce32..4a2c52eaac 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/src/fwl/src/core/include/fwl_gridimp.h" + +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 8de329a5cc..329d4c7936 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -6,11 +6,11 @@ #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_grid.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index 44563f77d1..1b6c777ad2 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_grid.h" #include "xfa/include/fwl/core/fwl_panel.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 999f5a6cdf..4ece3e881f 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" + #include "core/include/fxcrt/fx_system.h" #include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" -#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" #include "xfa/include/fwl/core/fwl_app.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index 7933d4ec54..6898588515 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" + FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const { return m_pImpl->GetClassName(wsClass); } diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index b63a3a4a33..de48068a3c 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" + #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" void IFWL_Thread::Release() { delete m_pImpl; diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp index bf7925c63d..19ab582340 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index 187bdab8fa..7100f193c9 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -19,7 +19,6 @@ #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 7255569500..9b6f695ee3 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_form.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h index f2e4e74bb0..54f4e5046d 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h @@ -10,6 +10,7 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_grid.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" class CFWL_GridLength { public: @@ -19,6 +20,7 @@ class CFWL_GridLength { FX_FLOAT fLength; FWL_GRIDUNIT eUnit; }; + class CFWL_GridColRow { public: CFWL_GridColRow() @@ -33,6 +35,7 @@ class CFWL_GridColRow { FX_FLOAT m_fActualSize; FX_FLOAT m_fActualPos; }; + class CFWL_GridWidgetInfo { public: CFWL_GridWidgetInfo() @@ -67,6 +70,7 @@ class CFWL_GridWidgetInfo { FX_FLOAT m_fActualWidth; FX_FLOAT m_fActualHeight; }; + class CFWL_GridImp : public CFWL_ContentImp { public: CFWL_GridImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); @@ -178,6 +182,7 @@ class CFWL_GridImp : public CFWL_ContentImp { CFWL_GridLength m_Size[6]; friend class CFWL_GridImpDelegate; }; + class CFWL_GridImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_GridImpDelegate(CFWL_GridImp* pOwner); diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 1ec6f162e3..31a39c17f0 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/lightwidget/theme.h" -#include "xfa/src/foxitlib.h" CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {} CFWL_App::~CFWL_App() { diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index 68b2f81545..4f05837352 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -8,8 +8,6 @@ #include <memory> -#include "xfa/src/foxitlib.h" - CFWL_Barcode* CFWL_Barcode::Create() { return new CFWL_Barcode; } diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index a7a7702ab6..d9c3363ae1 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/lightwidget/edit.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" CFWL_Caret* CFWL_Caret::Create() { diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index f2e24121d9..6b7a370973 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/src/foxitlib.h" CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index 1d5844b56d..aadb0d5ab6 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 2f01ec04b8..957ed87fed 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -12,7 +12,6 @@ #include "xfa/include/fwl/core/fwl_note.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" -#include "xfa/src/foxitlib.h" CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 58b4f49c4b..cf87ae031d 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/basewidget/fwl_edit.h" -#include "xfa/src/foxitlib.h" CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit; diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 9b8d105960..6a7a26cd1b 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -9,7 +9,6 @@ #include <memory> #include "third_party/base/stl_util.h" -#include "xfa/src/foxitlib.h" CFWL_ListBox* CFWL_ListBox::Create() { return new CFWL_ListBox; diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 7fcba77b9e..e35741c3ac 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -8,8 +8,6 @@ #include <memory> -#include "xfa/src/foxitlib.h" - CFWL_PictureBox* CFWL_PictureBox::Create() { return new CFWL_PictureBox; } diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index 5a7b981062..c9fb74e5f5 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -8,8 +8,6 @@ #include <memory> -#include "xfa/src/foxitlib.h" - CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton; } diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 0d8e15c673..cc927e724e 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" -#include "xfa/src/foxitlib.h" CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar; diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index 79c54df693..fe9f55928b 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -20,7 +20,6 @@ #include "xfa/include/fwl/theme/pictureboxtp.h" #include "xfa/include/fwl/theme/pushbuttontp.h" #include "xfa/include/fwl/theme/scrollbartp.h" -#include "xfa/src/foxitlib.h" CFWL_Theme::CFWL_Theme() { m_ThemesArray.push_back(std::unique_ptr<CFWL_WidgetTP>(new CFWL_FormTP)); diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index d3ce414e00..05149709ef 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -8,7 +8,6 @@ #include <memory> -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index df8abdeede..6603df7b57 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_thread.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/src/theme/barcodetp.cpp index fbbdeb2267..477ce99d9b 100644 --- a/xfa/src/fwl/src/theme/barcodetp.cpp +++ b/xfa/src/fwl/src/theme/barcodetp.cpp @@ -6,7 +6,6 @@ #include "xfa/include/fwl/theme/barcodetp.h" -#include "xfa/src/foxitlib.h" #include "xfa/include/fwl/basewidget/fwl_barcode.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_widget.h" diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/src/theme/carettp.cpp index 705d0e3880..88b01d9f3d 100644 --- a/xfa/src/fwl/src/theme/carettp.cpp +++ b/xfa/src/fwl/src/theme/carettp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index b288e5f19f..a33291472a 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define CHECKBOX_SIZE_SIGNMARGIN 3 #define CHECKBOX_SIZE_SIGNBORDER 2 diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index e2de30db4d..33be07d44c 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_combobox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_ComboFormHandler 8.0f diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp index ae8cee8f94..5efe0b850e 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -7,7 +7,6 @@ #include "xfa/include/fwl/theme/datetimepickertp.h" #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" -#include "xfa/src/foxitlib.h" CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() { m_pThemeData = new DTPThemeData; diff --git a/xfa/src/fwl/src/theme/edittp.cpp b/xfa/src/fwl/src/theme/edittp.cpp index d1389376af..a206faffe8 100644 --- a/xfa/src/fwl/src/theme/edittp.cpp +++ b/xfa/src/fwl/src/theme/edittp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_edit.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_EditTP::CFWL_EditTP() {} CFWL_EditTP::~CFWL_EditTP() {} diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index 4d98762c13..1d6dcd1c17 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_CXFormBorder 3 #define FWLTHEME_CAPACITY_CYFormBorder 3 diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index 7d76700368..8ffe669835 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_listbox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_ListBoxTP::CFWL_ListBoxTP() {} CFWL_ListBoxTP::~CFWL_ListBoxTP() {} diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 1de8e57fdb..47384b979f 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200 #define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30 diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/src/theme/pictureboxtp.cpp index 0a373bdcb1..5d7c079e86 100644 --- a/xfa/src/fwl/src/theme/pictureboxtp.cpp +++ b/xfa/src/fwl/src/theme/pictureboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_picturebox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} CFWL_PictureBoxTP::~CFWL_PictureBoxTP() {} diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 63062562a8..76e0eab7dc 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define PUSHBUTTON_SIZE_Corner 2 diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index b0965f5557..424ff549e5 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define FWL_SCROLL_PawLen 12.5f diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index af634e67c7..7fa7812092 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_widgetmgr.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 22fe715450..3d6f1a7175 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -6,8 +6,8 @@ #include "xfa/src/fxfa/src/app/xfa_checksum.h" +#include "core/include/fdrm/fx_crypt.h" #include "xfa/src/fgas/include/fx_alg.h" -#include "xfa/src/foxitlib.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index ed16cb8629..49478e0d23 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include "xfa/include/fwl/core/fwl_widgetmgr.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index c12852e4e4..3a228de203 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -6,9 +6,9 @@ #include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/lightwidget/barcode.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index d0e36aa88d..33e9abf496 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_widgetmgr.h" #include "xfa/include/fwl/lightwidget/checkbox.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 2d68887d0e..d61b6df79c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/lightwidget/combobox.h" #include "xfa/include/fwl/lightwidget/listbox.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index f2dc104bee..1f04d7e560 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -6,9 +6,10 @@ #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/include/fwl/core/fwl_note.h" #include "xfa/src/fgas/include/fx_alg.h" -#include "xfa/src/foxitlib.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_ffnotify.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index 20eb44677b..2f636b63ef 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.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_ffdoc.h" #include "xfa/src/fxfa/src/common/xfa_script.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h index 36fb149cca..216df72b6f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_ +#include "xfa/include/fxfa/fxfa.h" + class CXFA_FFDocHandler : public IXFA_DocHandler { public: CXFA_FFDocHandler(); diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index 05b78ecca4..1bb504ed3c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" + +#include "core/include/fxcrt/fx_ext.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_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_ffexclgroup.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index 8a5379258d..4f575cb991 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index 171cf573bb..ba2bb8028c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.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" diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index 7616dcbdb3..106256d91f 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_widgetmgr.h" #include "xfa/include/fwl/lightwidget/edit.h" #include "xfa/include/fwl/lightwidget/picturebox.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 9fd17a7622..263167600c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.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_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.h b/xfa/src/fxfa/src/app/xfa_ffimage.h index 8bece23818..64e0f98a26 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.h +++ b/xfa/src/fxfa/src/app/xfa_ffimage.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_ +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" + class CXFA_FFImage : public CXFA_FFDraw { public: CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 8f3a838f4e..5348849975 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/lightwidget/picturebox.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index b9078b309e..19ce6320b6 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.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" @@ -16,7 +17,6 @@ #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" diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h index 311d99b95d..3a6093be7c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.h +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" + class CXFA_FFNotify : public IXFA_Notify { public: CXFA_FFNotify(CXFA_FFDoc* pDoc); diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 45ef2b25c3..2a88e50343 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fdp/include/fde_rdr.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index 7c3239fb50..1fdcb83051 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" + +#include "xfa/include/fxgraphics/fx_graphics.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_ffpath.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.h b/xfa/src/fxfa/src/app/xfa_ffpath.h index b970c989c4..05a67bd16f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.h +++ b/xfa/src/fxfa/src/app/xfa_ffpath.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_ +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" + class CXFA_FFLine : public CXFA_FFDraw { public: CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index e6efa13b86..9c3c5f5b17 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_widgetmgr.h" #include "xfa/include/fwl/lightwidget/pushbutton.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 907e3024c2..a53d7c26a3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.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_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_ffwidget.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/src/app/xfa_ffsignature.h index 79cc0ad407..d873614ed8 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.h +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" + class CXFA_FFSignature final : public CXFA_FFField { public: CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -36,8 +38,6 @@ class CXFA_FFSignature final : public CXFA_FFField { virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags); virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy); - - protected: }; #endif // XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index 6da604d6cf..0e932b22a2 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.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" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index dffcfdf361..d1774e67a2 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -7,7 +7,7 @@ #include "xfa/src/fxfa/src/app/xfa_fftext.h" #include "xfa/include/fwl/core/fwl_widgetdef.h" -#include "xfa/src/foxitlib.h" +#include "xfa/include/fxgraphics/fx_graphics.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" diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index 361f70573c..c1982ce24f 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/basewidget/fwl_edit.h" #include "xfa/include/fwl/lightwidget/datetimepicker.h" #include "xfa/include/fwl/lightwidget/edit.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 8cc281ccff..30569ef4a3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -4,14 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + #include <algorithm> -#include "xfa/src/foxitlib.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fxcodec/fx_codec.h" +#include "xfa/include/fxgraphics/fx_graphics.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_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 7d646ca297..dbdc02a871 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index bb8db6a9f4..d5f286668c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.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_parser.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h index 2f3453d84f..645a9e7bb1 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h @@ -10,6 +10,7 @@ #include <vector> #include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" class CXFA_FFDocView; diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index c5d175abec..f1cc37f244 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" + #include <algorithm> -#include "xfa/src/foxitlib.h" +#include "core/include/fpdfapi/fpdf_resource.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" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h index e3fb99e824..86c08d0fa5 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.h +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h @@ -9,6 +9,11 @@ #include <map> +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fgas/include/fx_fnt.h" + struct XFA_FONTINFO { FX_DWORD dwFontNameHash; const FX_WCHAR* pPsName; diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index c97b4fe871..174e31d8ca 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.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_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {} FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/src/app/xfa_fwladapter.h index 91210717c1..88a7fa930b 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.h +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_ +#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" + class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr { public: virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect); diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 851f9d6102..1b768e8489 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -19,7 +19,6 @@ #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 27fb91a1e4..def0c78d22 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_rendercontext.h" +#include "xfa/include/fxgraphics/fx_graphics.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + #define XFA_RENDERCONTEXT_MaxCount 30 IXFA_RenderContext* XFA_RenderContext_Create() { diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h index 9f91d23e56..67ec9cbb0b 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.h +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_ +#include "xfa/include/fxfa/fxfa.h" + class CXFA_RenderContext : public IXFA_RenderContext { public: CXFA_RenderContext(); diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 8ce97e28ae..7d03cddeb9 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -8,9 +8,10 @@ #include <algorithm> +#include "core/include/fxcrt/fx_ext.h" +#include "xfa/src/fdp/include/fde_pen.h" #include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h index 67f3b7e193..80a723aae2 100644 --- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h +++ b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "xfa/include/fxjse/fxjse.h" + #define FOXIT_XFA_FM2JS_FORMCALC_RUNTIME "foxit_xfa_formcalc_runtime" #ifdef __cplusplus diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index 4b8495125d..ebd3a0f00e 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_ +#include "xfa/include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa_objectacc.h" + #define XFA_RESOLVENODE_Children 0x0001 #define XFA_RESOLVENODE_Attributes 0x0004 #define XFA_RESOLVENODE_Properties 0x0008 @@ -17,11 +20,13 @@ #define XFA_RESOLVENODE_CreateNode 0x0400 #define XFA_RESOLVENODE_Bind 0x0800 #define XFA_RESOLVENODE_BindNew 0x1000 + enum XFA_SCRIPTLANGTYPE { XFA_SCRIPTLANGTYPE_Formcalc = XFA_SCRIPTTYPE_Formcalc, XFA_SCRIPTLANGTYPE_Javascript = XFA_SCRIPTTYPE_Javascript, XFA_SCRIPTLANGTYPE_Unkown = XFA_SCRIPTTYPE_Unkown, }; + enum XFA_RESOVENODE_RSTYPE { XFA_RESOVENODE_RSTYPE_Nodes, XFA_RESOVENODE_RSTYPE_Attribute, @@ -30,6 +35,7 @@ enum XFA_RESOVENODE_RSTYPE { XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll, XFA_RESOVENODE_RSTYPE_ExistNodes, }; + class CXFA_HVALUEArray : public CFX_ArrayTemplate<FXJSE_HVALUE> { public: CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime){}; diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index 77eebc66ed..010a1aadde 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -8,6 +8,7 @@ #define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ #include "xfa/include/fxfa/fxfa_basic.h" +#include "xfa/src/fdp/include/fde_xml.h" class CXFA_LocaleValue; diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index e0356d119a..10ff415141 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -7,7 +7,6 @@ #ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ -#include "xfa/src/foxitlib.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_document.h" diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index 69fbbfb2de..10f9e8aab4 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -6,6 +6,7 @@ #include <time.h> +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fxfa/src/common/fxfa_localevalue.h" #include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp index b4af01f0c0..caaeb49474 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" namespace { diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp index 68faa7ae0c..e1da83747d 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" namespace { diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index d73557db2c..891eaf6a96 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -6,7 +6,6 @@ #include "xfa/src/fxfa/src/parser/xfa_basic_data.h" -#include "xfa/src/foxitlib.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_document.h" diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index f724ed654c..8ec881ed6c 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" + +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/foxitlib.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_document.h" @@ -18,7 +20,6 @@ #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_data.h" -#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) { int32_t iLength = wsName.GetLength(); 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 2a6146ba21..27cc8f0c9c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.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_document.h" @@ -14,7 +13,9 @@ #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: static inline CXFA_Node* GetFirstChild(CXFA_Node* pDDGroupNode) { 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 c2a53ac70e..da6b57f3d1 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" + +#include "core/include/fxcrt/fx_ext.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_document.h" @@ -16,8 +18,8 @@ #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" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" + static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode, int32_t& iMin, int32_t& iMax, diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h index 72c40dcf63..48a08f856c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" + CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer( CXFA_Document* pDocument, CXFA_Node* pFormParent, diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 6cf8f06301..28cf381e7f 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "core/include/fxcrt/fx_ext.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_document.h" @@ -22,6 +22,7 @@ #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), m_pScriptContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index f0835df253..6cb47085fa 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.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_document.h" @@ -16,10 +17,10 @@ #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_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" + CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() { if (!m_pLayoutProcessor) { m_pLayoutProcessor = new CXFA_LayoutProcessor(this); diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h index 28854937c4..7411a9b13c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h @@ -7,9 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" + class CXFA_ItemLayoutProcessor; class CXFA_LayoutPageMgr; class CXFA_ContainerLayoutItem; + class CXFA_LayoutProcessor : public IXFA_DocLayout { public: CXFA_LayoutProcessor(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index fc05d7de6e..9e54e453fa 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fxfa/src/parser/xfa_document_serialize.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.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_document.h" diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp index 7653410c14..d5eebd0e0a 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.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_document.h" @@ -15,9 +16,9 @@ #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" + 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_appadapter.h b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h index 6ae4706343..4221f7f355 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" + class CXFA_TraverseStrategy_PageAreaContainerLayoutItem { public: static inline CXFA_ContainerLayoutItem* GetFirstChild( diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 05fd16fb23..381dc92ff8 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -10,7 +10,6 @@ #include <memory> #include "xfa/src/fgas/include/fx_alg.h" -#include "xfa/src/foxitlib.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_document.h" 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 6634962fb0..84de094d4e 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.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_document.h" @@ -18,7 +19,7 @@ #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" + CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor) : m_pLayoutProcessor(pLayoutProcessor), m_pTemplatePageSetRoot(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h index 35f1827790..5dd83b9556 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" + class CXFA_ContainerRecord { public: CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = NULL, diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index f75853a418..e3e63d7951 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/parser/xfa_locale.h" + #include "core/include/fxcrt/fx_xml.h" -#include "xfa/src/foxitlib.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_document.h" @@ -15,12 +16,12 @@ #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%"; -static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99"; -static const FX_WCHAR* g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz"; -static const FX_WCHAR* g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz"; +static const FX_WCHAR g_FX_Percent[] = L"z,zzz,zzz,zzz,zzz,zzz%"; +static const FX_WCHAR g_FX_Currency[] = L"$z,zzz,zzz,zzz,zzz,zz9.99"; +static const FX_WCHAR g_FX_Decimal[] = L"z,zzz,zzz,zzz,zzz,zz9.zzz"; +static const FX_WCHAR g_FX_Integer[] = L"z,zzz,zzz,zzz,zzz,zzz"; + CXFA_XMLLocale::CXFA_XMLLocale(CXML_Element* pLocaleData) { m_pLocaleData = pLocaleData; } diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h index 60336f6e88..a8391a0c5e 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.h +++ b/xfa/src/fxfa/src/parser/xfa_locale.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_ +#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CXFA_XMLLocale : public IFX_Locale { public: CXFA_XMLLocale(CXML_Element* pLocaleData); diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index 4db32db56f..8d0c8d27f4 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" + +#include "core/include/fxcodec/fx_codec.h" #include "core/include/fxcrt/fx_xml.h" -#include "xfa/src/foxitlib.h" +#include "core/include/fxge/fx_ge.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_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" diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 838634d1e9..ba00c2e639 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/fxfa_localevalue.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_document.h" diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 65992c4201..1c5bd758a8 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/foxitlib.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_document.h" diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 9c3b5383dc..c8e00e82da 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "core/include/fxcrt/fx_ext.h" +#include "xfa/include/fxbarcode/BC_BarCode.h" #include "xfa/src/fxfa/src/common/fxfa_localevalue.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 35dca5d076..c2f15a18a6 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/foxitlib.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_document.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index 26b3616a3e..fa7d2560c6 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.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_document.h" @@ -14,7 +15,7 @@ #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) { m_uScriptHash = XFA_HASHCODE_DataWindow; diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h index 8be21a762f..8274d05d25 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CScript_DataWindow : public CXFA_OrdinaryObject { public: CScript_DataWindow(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index 99fe7c255e..26ae836fc8 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.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_document.h" @@ -14,7 +15,7 @@ #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) { m_uScriptHash = XFA_HASHCODE_Event; diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h index 31646cc8d6..b6bfeab574 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" + #define XFA_EVENT_CHANGE 0 #define XFA_EVENT_COMMITKEY 1 #define XFA_EVENT_FULLTEXT 2 @@ -24,9 +26,10 @@ #define XFA_EVENT_SOAPFAULTSTRING 14 #define XFA_EVENT_TARGET 15 #define XFA_EVENT_CANCELACTION 16 + class CScript_EventPseudoModel : public CXFA_OrdinaryObject { public: - CScript_EventPseudoModel(CXFA_Document* pDocument); + explicit CScript_EventPseudoModel(CXFA_Document* pDocument); virtual ~CScript_EventPseudoModel(); void Script_EventPseudoModel_CancelAction(FXJSE_HVALUE hValue, diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index b495a774bc..69d6c41ab3 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.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_document.h" @@ -14,7 +15,7 @@ #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) { m_uScriptHash = XFA_HASHCODE_Host; diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h index f17a85dc06..0b9e80e149 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CScript_HostPseudoModel : public CXFA_OrdinaryObject { public: CScript_HostPseudoModel(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index dc48c7e4b2..2b99e24306 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" + +#include "core/include/fxcrt/fx_ext.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_document.h" @@ -14,9 +16,9 @@ #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_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument) : m_pDocument(pDocument), m_hJsContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h index a0610fae9f..15dc09d726 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h @@ -9,13 +9,19 @@ #include <map> +#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_script.h" + #define XFA_RESOLVENODE_TagName 0x0002 class CXFA_ResolveProcessor; + class CXFA_ScriptContext : public IXFA_ScriptContext { public: - CXFA_ScriptContext(CXFA_Document* pDocument); + explicit CXFA_ScriptContext(CXFA_Document* pDocument); ~CXFA_ScriptContext(); + virtual void Release(); virtual void Initialize(FXJSE_HRUNTIME hRuntime); virtual void SetEventParam(CXFA_EventParam param) { m_eventParam = param; } diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index 5cf43af336..6f032d2c45 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.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_document.h" @@ -16,7 +17,7 @@ #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_layoutpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h index f0420e71fd..ff43bd7bd8 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h @@ -7,15 +7,19 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + enum XFA_LAYOUTMODEL_HWXY { XFA_LAYOUTMODEL_H, XFA_LAYOUTMODEL_W, XFA_LAYOUTMODEL_X, XFA_LAYOUTMODEL_Y }; + class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject { public: - CScript_LayoutPseudoModel(CXFA_Document* pDocument); + explicit CScript_LayoutPseudoModel(CXFA_Document* pDocument); ~CScript_LayoutPseudoModel(); void Script_LayoutPseudoModel_Ready(FXJSE_HVALUE hValue, diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index be69240508..dd51a62d44 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.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_document.h" @@ -14,7 +15,7 @@ #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) { m_uScriptHash = XFA_HASHCODE_Log; diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h index 60be763b47..65bfbb112f 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h @@ -7,9 +7,11 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CScript_LogPseudoModel : public CXFA_OrdinaryObject { public: - CScript_LogPseudoModel(CXFA_Document* pDocument); + explicit CScript_LogPseudoModel(CXFA_Document* pDocument); virtual ~CScript_LogPseudoModel(); void Script_LogPseudoModel_Message(CFXJSE_Arguments* pArguments); diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 1759de01c0..9176bcc34e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" + +#include "core/include/fxcrt/fx_ext.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_document.h" @@ -15,7 +17,7 @@ #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_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h index 37a369170a..b3dc86abc0 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h @@ -7,11 +7,16 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" + class CXFA_ScriptContext; + enum XFA_LOGIC_TYPE { XFA_LOGIC_NoTransparent, XFA_LOGIC_Transparent, }; + class CXFA_NodeHelper { public: CXFA_NodeHelper(void); diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index fcbf08b5a7..2d4349b6f3 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" + +#include "core/include/fxcrt/fx_ext.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_document.h" @@ -16,7 +18,7 @@ #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_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h index 29ba96476b..e2dbaf99b2 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h @@ -7,8 +7,13 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_ +#include "xfa/include/fxfa/fxfa_objectacc.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" + class CXFA_NodeHelper; class CXFA_ScriptContext; + class CXFA_ResolveNodesData { public: CXFA_ResolveNodesData(CXFA_ScriptContext* pSC = NULL) diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index 0b22dc3b61..74bcaf8a7f 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.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_document.h" @@ -14,7 +15,7 @@ #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) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_SignaturePseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h index 56ef052110..6a956836b3 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject { public: 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 4dbf3e0a60..0686401573 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fxfa/src/common/fxfa_localevalue.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp index 81fdc4e322..29f90ed44b 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_utils.h" TEST(XfaUtilsImp, XFA_MapRotation) { diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index 3f8c07cedf..301bd7c356 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -6,6 +6,7 @@ #include <memory> +#include "xfa/include/fxgraphics/fx_graphics.h" #include "xfa/src/fxgraphics/src/fx_path_generator.h" #include "xfa/src/fxgraphics/src/pre.h" diff --git a/xfa/src/fxgraphics/src/pre.h b/xfa/src/fxgraphics/src/pre.h index 1a1820551a..582d999d7e 100644 --- a/xfa/src/fxgraphics/src/pre.h +++ b/xfa/src/fxgraphics/src/pre.h @@ -7,8 +7,6 @@ #ifndef XFA_SRC_FXGRAPHICS_SRC_PRE_H_ #define XFA_SRC_FXGRAPHICS_SRC_PRE_H_ -#include "xfa/src/foxitlib.h" - enum { FX_CONTEXT_None = 0, FX_CONTEXT_Device, @@ -16,13 +14,16 @@ enum { enum { FX_COLOR_None = 0, FX_COLOR_Solid, FX_COLOR_Pattern, FX_COLOR_Shading }; enum { FX_PATTERN_None = 0, FX_PATTERN_Bitmap, FX_PATTERN_Hatch }; enum { FX_SHADING_None = 0, FX_SHADING_Axial, FX_SHADING_Radial }; + #define FX_HATCHSTYLE_Total 53 + struct FX_HATCHDATA { int32_t width; int32_t height; uint8_t maskBits[64]; }; typedef FX_HATCHDATA const* FX_LPCHATCHDATA; + static const FX_HATCHDATA hatchBitmapData[FX_HATCHSTYLE_Total] = { {16, 16, diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index ca36c358ef..6ca3be8b72 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fxjse/src/class.h" + #include "xfa/src/fxjse/src/context.h" #include "xfa/src/fxjse/src/scope_inline.h" #include "xfa/src/fxjse/src/util_inline.h" diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h index 89c49abcf6..794a34e7b8 100644 --- a/xfa/src/fxjse/src/class.h +++ b/xfa/src/fxjse/src/class.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXJSE_SRC_CLASS_H_ #define XFA_SRC_FXJSE_SRC_CLASS_H_ -#include <v8.h> +#include "v8/include/v8.h" +#include "xfa/include/fxjse/fxjse.h" class CFXJSE_Context; class CFXJSE_Value; diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index 83d1279327..54b4f64efc 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fxjse/src/class.h" #include "xfa/src/fxjse/src/context.h" + +#include "xfa/src/fxjse/src/class.h" #include "xfa/src/fxjse/src/scope_inline.h" #include "xfa/src/fxjse/src/util_inline.h" #include "xfa/src/fxjse/src/value.h" diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h index 1b83ebb6d1..e6c16445cd 100644 --- a/xfa/src/fxjse/src/context.h +++ b/xfa/src/fxjse/src/context.h @@ -7,8 +7,12 @@ #ifndef XFA_SRC_FXJSE_SRC_CONTEXT_H_ #define XFA_SRC_FXJSE_SRC_CONTEXT_H_ +#include "v8/include/v8.h" +#include "xfa/include/fxjse/fxjse.h" + class CFXJSE_Class; class CFXJSE_Value; + class CFXJSE_Context { protected: CFXJSE_Context(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {} diff --git a/xfa/src/fxjse/src/dynprop.cpp b/xfa/src/fxjse/src/dynprop.cpp index f8dc19fc40..26beb5c283 100644 --- a/xfa/src/fxjse/src/dynprop.cpp +++ b/xfa/src/fxjse/src/dynprop.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fxjse/src/class.h" #include "xfa/src/fxjse/src/value.h" diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/src/runtime.cpp index a276319e6c..99a29c7da4 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/src/runtime.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/jsapi/fxjs_v8.h" // For per-isolate data. -#include "xfa/src/foxitlib.h" #include "xfa/src/fxjse/src/runtime.h" + +#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "xfa/src/fxjse/src/scope_inline.h" // Duplicates fpdfsdk's JS_Runtime.h, but keeps XFA from depending on it. diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h index 64a3a9454f..77a447f442 100644 --- a/xfa/src/fxjse/src/runtime.h +++ b/xfa/src/fxjse/src/runtime.h @@ -7,7 +7,11 @@ #ifndef XFA_SRC_FXJSE_SRC_RUNTIME_H_ #define XFA_SRC_FXJSE_SRC_RUNTIME_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "v8/include/v8.h" + class CFXJSE_RuntimeList; + class CFXJSE_RuntimeData { protected: CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate){}; @@ -29,6 +33,7 @@ class CFXJSE_RuntimeData { CFXJSE_RuntimeData(const CFXJSE_RuntimeData&); CFXJSE_RuntimeData& operator=(const CFXJSE_RuntimeData&); }; + class CFXJSE_RuntimeList { public: typedef void (*RuntimeDisposeCallback)(v8::Isolate*); diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index aa0f7cfc86..b3c47b65c0 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxjse/src/value.h" + #include <math.h> -#include "xfa/src/foxitlib.h" #include "xfa/src/fxjse/src/class.h" #include "xfa/src/fxjse/src/util_inline.h" -#include "xfa/src/fxjse/src/value.h" FX_BOOL FXJSE_Value_IsUndefined(FXJSE_HVALUE hValue) { CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue); |