diff options
Diffstat (limited to 'fpdfsdk')
43 files changed, 90 insertions, 91 deletions
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index a1009c5cdf..1f4a1c5590 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -13,7 +13,7 @@ #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index bf94aefa6e..e9c58b24ee 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -18,8 +18,8 @@ #include "testing/test_support.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA class CPDF_TestDocument : public CPDF_Document { diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index 25ace0e039..acd259cc6b 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -24,9 +24,9 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 26bc30e07c..bcd8a7472f 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -18,9 +18,9 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #include "xfa/include/fxfa/xfa_ffapp.h" #include "xfa/include/fxfa/xfa_ffdocview.h" #include "xfa/include/fxfa/xfa_ffpageview.h" diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index 11a22ac854..79b71bc15a 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -19,9 +19,9 @@ #include "public/fpdf_edit.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #include "xfa/include/fxfa/xfa_checksum.h" #include "xfa/include/fxfa/xfa_ffapp.h" diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 24b592a88b..3faf26aceb 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -14,8 +14,8 @@ #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 2b69e94765..df7518902f 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -24,10 +24,10 @@ #include "third_party/base/numerics/safe_conversions_impl.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 0d3011e659..b7a5b15dd9 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index 7ef369a04b..28b17fb6d1 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -8,10 +8,10 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" #include "fpdfsdk/javascript/ijs_runtime.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index dc4185af2d..a62cabc2df 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" #include "xfa/include/fxfa/xfa_ffdocview.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index 49efceb8e4..4fb92e76ae 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include <vector> diff --git a/fpdfsdk/include/fpdfxfa/DEPS b/fpdfsdk/fpdfxfa/include/DEPS index f207778cb2..f207778cb2 100644 --- a/fpdfsdk/include/fpdfxfa/DEPS +++ b/fpdfsdk/fpdfxfa/include/DEPS diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h index ed626716f7..2ad798c0e3 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_ -#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_ +#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ +#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ #include "xfa/include/fxfa/fxfa.h" @@ -95,4 +95,4 @@ class CPDFXFA_App : public IXFA_AppProvider { bool m_bOwnedRuntime; }; -#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_APP_H_ +#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h index dc09c8b656..7fbf532923 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_ -#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_ +#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ +#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ #include <vector> @@ -235,4 +235,4 @@ class CPDFXFA_Document : public IXFA_DocProvider { int m_nPageCount; }; -#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_ +#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h index 20da040a23..2c860ffbdc 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_ -#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_ +#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ +#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" @@ -74,4 +74,4 @@ class CPDFXFA_Page { int m_iRef; }; -#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_ +#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h index e0c508baa5..3f17662976 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ -#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ +#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ +#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ #include <vector> -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "xfa/fwl/core/include/ifwl_adaptertimermgr.h" #define JS_STR_VIEWERTYPE_STANDARD L"Exchange" @@ -44,4 +44,4 @@ struct CFWL_TimerInfo { IFWL_Timer* pTimer; }; -#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ +#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ diff --git a/fpdfsdk/fsdk_annothandler.cpp b/fpdfsdk/fsdk_annothandler.cpp index 5afe8e493b..2e421fc40f 100644 --- a/fpdfsdk/fsdk_annothandler.cpp +++ b/fpdfsdk/fsdk_annothandler.cpp @@ -16,9 +16,9 @@ #include "fpdfsdk/include/fsdk_mgr.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "xfa/fxgraphics/include/cfx_graphics.h" #include "xfa/include/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp index 249fd83fc8..b3363bfbc7 100644 --- a/fpdfsdk/fsdk_baseannot.cpp +++ b/fpdfsdk/fsdk_baseannot.cpp @@ -16,7 +16,7 @@ #include "fpdfsdk/include/fsdk_mgr.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA int gAfxGetTimeZoneInSeconds(int8_t tzhour, uint8_t tzminute) { diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp index 3dad62472f..cc2fe5272e 100644 --- a/fpdfsdk/fsdk_baseform.cpp +++ b/fpdfsdk/fsdk_baseform.cpp @@ -25,8 +25,8 @@ #include "fpdfsdk/pdfwindow/PWL_Utils.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "xfa/include/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp index cc228eb8b9..f905374bee 100644 --- a/fpdfsdk/fsdk_mgr.cpp +++ b/fpdfsdk/fsdk_mgr.cpp @@ -19,10 +19,10 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "xfa/fxgraphics/include/cfx_graphics.h" #include "xfa/include/fxfa/xfa_rendercontext.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp index 48c6876a74..cafce2eb04 100644 --- a/fpdfsdk/fxedit/fxet_ap.cpp +++ b/fpdfsdk/fxedit/fxet_ap.cpp @@ -8,8 +8,8 @@ #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fpdfdoc/include/cpvt_word.h" #include "core/fpdfdoc/include/ipvt_fontmap.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" -#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" +#include "fpdfsdk/fxedit/include/fxet_edit.h" CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap, int32_t nFontIndex, diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index f275248ac2..07a9d864d7 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/fxedit/include/fxet_edit.h" #include <algorithm> diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp index f3db38612c..af6e8588f6 100644 --- a/fpdfsdk/fxedit/fxet_list.cpp +++ b/fpdfsdk/fxedit/fxet_list.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fxedit/fxet_list.h" +#include "fpdfsdk/fxedit/include/fxet_list.h" #include "core/fpdfdoc/include/cpvt_word.h" -#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/fxedit/include/fxet_edit.h" CFX_ListItem::CFX_ListItem() : m_pEdit(NULL), diff --git a/fpdfsdk/fxedit/fxet_module.cpp b/fpdfsdk/fxedit/fxet_module.cpp index 330b72bc8b..99fd68e397 100644 --- a/fpdfsdk/fxedit/fxet_module.cpp +++ b/fpdfsdk/fxedit/fxet_module.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfdoc/include/cpdf_variabletext.h" -#include "fpdfsdk/include/fxedit/fxet_edit.h" -#include "fpdfsdk/include/fxedit/fxet_list.h" +#include "fpdfsdk/fxedit/include/fxet_edit.h" +#include "fpdfsdk/fxedit/include/fxet_list.h" IFX_Edit* IFX_Edit::NewEdit() { return new CFX_Edit(new CPDF_VariableText()); diff --git a/fpdfsdk/fxedit/fxet_pageobjs.cpp b/fpdfsdk/fxedit/fxet_pageobjs.cpp index 41252277ac..cbe6fabcb6 100644 --- a/fpdfsdk/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/fxedit/fxet_pageobjs.cpp @@ -13,9 +13,9 @@ #include "core/fpdfdoc/include/cpvt_word.h" #include "core/fpdfdoc/include/ipvt_fontmap.h" #include "core/fxge/include/fx_ge.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" +#include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/include/fx_systemhandler.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" -#include "fpdfsdk/include/fxedit/fxet_edit.h" #define FX_EDIT_UNDERLINEHALFWIDTH 0.5f #define FX_EDIT_CROSSOUTHALFWIDTH 0.5f diff --git a/fpdfsdk/include/fxedit/DEPS b/fpdfsdk/fxedit/include/DEPS index db9a09c342..db9a09c342 100644 --- a/fpdfsdk/include/fxedit/DEPS +++ b/fpdfsdk/fxedit/include/DEPS diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/fxedit/include/fx_edit.h index 46896457af..4220c0bd01 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/fxedit/include/fx_edit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ -#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ +#ifndef FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_ +#define FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_ #include "core/fpdfdoc/include/cpdf_variabletext.h" #include "core/fxcrt/include/fx_basic.h" @@ -626,4 +626,4 @@ CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap, uint16_t Word, uint16_t SubWord); -#endif // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ +#endif // FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_ diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h index fb6c917582..4233b1d301 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/fxedit/include/fxet_edit.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ -#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ +#ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_ +#define FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_ #include "core/fpdfdoc/include/cpvt_secprops.h" #include "core/fpdfdoc/include/cpvt_wordprops.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" class CFX_Edit; class CFX_Edit_Iterator; @@ -714,7 +714,6 @@ class CFX_Edit : public IFX_Edit { CPVT_WordRange CombineWordRange(const CPVT_WordRange& wr1, const CPVT_WordRange& wr2); - void BeginGroupUndo(const CFX_WideString& sTitle); void EndGroupUndo(); void AddEditUndoItem(CFX_Edit_UndoItem* pEditUndoItem); @@ -801,4 +800,4 @@ class CFX_Edit_Provider : public CPDF_VariableText::Provider { IPVT_FontMap* m_pFontMap; }; -#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ +#endif // FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_ diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/fxedit/include/fxet_list.h index 0018f13b46..1f855b7747 100644 --- a/fpdfsdk/include/fxedit/fxet_list.h +++ b/fpdfsdk/fxedit/include/fxet_list.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ -#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ +#ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_ +#define FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_ -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" class IFX_Edit; @@ -340,4 +340,4 @@ class CFX_ListCtrl : public CFX_List { int32_t m_nCaretIndex; // for multiple }; -#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ +#endif // FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_ diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 9882888ed9..d5f752c49b 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -14,7 +14,7 @@ #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/javascript/JS_Define.h b/fpdfsdk/javascript/JS_Define.h index 3c148cf358..4e158fda29 100644 --- a/fpdfsdk/javascript/JS_Define.h +++ b/fpdfsdk/javascript/JS_Define.h @@ -9,10 +9,10 @@ #include <vector> -#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/resource.h" +#include "fpdfsdk/jsapi/include/fxjs_v8.h" struct JSConstSpec { const wchar_t* pName; diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h index e0ec23e79a..49c078d927 100644 --- a/fpdfsdk/javascript/JS_Object.h +++ b/fpdfsdk/javascript/JS_Object.h @@ -11,8 +11,8 @@ #include <memory> #include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "fpdfsdk/javascript/cjs_runtime.h" +#include "fpdfsdk/jsapi/include/fxjs_v8.h" class CJS_Context; class CJS_Object; diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h index 69656ea18c..423d7f62e1 100644 --- a/fpdfsdk/javascript/JS_Value.h +++ b/fpdfsdk/javascript/JS_Value.h @@ -10,7 +10,7 @@ #include <vector> #include "core/fxcrt/include/fx_basic.h" -#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "fpdfsdk/jsapi/include/fxjs_v8.h" class CJS_Array; class CJS_Date; diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 8e01017467..8fd7cf1a0e 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -13,7 +13,6 @@ #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/Icon.h" -#include "fpdfsdk/javascript/cjs_context.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_GlobalData.h" @@ -21,6 +20,7 @@ #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/PublicMethods.h" #include "fpdfsdk/javascript/app.h" +#include "fpdfsdk/javascript/cjs_context.h" #include "fpdfsdk/javascript/color.h" #include "fpdfsdk/javascript/console.h" #include "fpdfsdk/javascript/event.h" @@ -30,7 +30,7 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" #include "xfa/fxjse/value.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index 97e30e7eee..e2091fdcfd 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -14,9 +14,9 @@ #include <vector> #include "core/fxcrt/include/fx_basic.h" -#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" +#include "fpdfsdk/jsapi/include/fxjs_v8.h" class CJS_Context; diff --git a/fpdfsdk/jsapi/fxjs_v8.cpp b/fpdfsdk/jsapi/fxjs_v8.cpp index 034f2c6642..db64eee974 100644 --- a/fpdfsdk/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/jsapi/fxjs_v8.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "fpdfsdk/jsapi/include/fxjs_v8.h" #include <vector> diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/jsapi/include/fxjs_v8.h index 00107ef7e5..34ff377d92 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/jsapi/include/fxjs_v8.h @@ -11,8 +11,8 @@ // PDFium code should include this file rather than including V8 headers // directly. -#ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ -#define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ +#ifndef FPDFSDK_JSAPI_INCLUDE_FXJS_V8_H_ +#define FPDFSDK_JSAPI_INCLUDE_FXJS_V8_H_ #include <v8-util.h> #include <v8.h> @@ -114,7 +114,7 @@ class FXJS_PerIsolateData { protected: #ifndef PDF_ENABLE_XFA FXJS_PerIsolateData() : m_pDynamicObjsMap(nullptr) {} -#else // PDF_ENABLE_XFA +#else // PDF_ENABLE_XFA FXJS_PerIsolateData() : m_pFXJSERuntimeData(nullptr), m_pDynamicObjsMap(nullptr) {} #endif // PDF_ENABLE_XFA @@ -302,4 +302,4 @@ v8::Local<v8::Array> FXJS_ToArray(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue); void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom); -#endif // FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ +#endif // FPDFSDK_JSAPI_INCLUDE_FXJS_V8_H_ diff --git a/fpdfsdk/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h index 58793e3395..2cdc4d149d 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/pdfwindow/PWL_Edit.h @@ -8,7 +8,7 @@ #define FPDFSDK_PDFWINDOW_PWL_EDIT_H_ #include "core/fxcrt/include/fx_basic.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h index 6d35ce9537..a8de08aaa6 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h @@ -8,7 +8,7 @@ #define FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_ #include "core/fxcrt/include/fx_string.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" class CPWL_Caret; diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index 70806ebdbc..7533b1e787 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h @@ -8,7 +8,7 @@ #define FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_ #include "core/fpdfdoc/include/ipvt_fontmap.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "public/fpdf_sysfontinfo.h" class CPDF_Document; diff --git a/fpdfsdk/pdfwindow/PWL_Label.cpp b/fpdfsdk/pdfwindow/PWL_Label.cpp index 0e9a9f687d..5560b59eb1 100644 --- a/fpdfsdk/pdfwindow/PWL_Label.cpp +++ b/fpdfsdk/pdfwindow/PWL_Label.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Label.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h index caee22578b..37299e12df 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/pdfwindow/PWL_ListBox.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PDFWINDOW_PWL_LISTBOX_H_ #define FPDFSDK_PDFWINDOW_PWL_LISTBOX_H_ -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" class CPWL_List_Notify; diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 6a872bd4df..fe0075c2b0 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp @@ -10,7 +10,7 @@ #include "core/fpdfdoc/include/cpvt_word.h" #include "core/fxge/include/fx_ge.h" -#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Icon.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" |