diff options
31 files changed, 66 insertions, 68 deletions
@@ -1050,15 +1050,15 @@ if (pdf_enable_xfa) { static_library("fpdfxfa") { sources = [ "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp", + "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h", "fpdfsdk/fpdfxfa/fpdfxfa_app.cpp", + "fpdfsdk/fpdfxfa/fpdfxfa_app.h", "fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp", + "fpdfsdk/fpdfxfa/fpdfxfa_doc.h", "fpdfsdk/fpdfxfa/fpdfxfa_page.cpp", + "fpdfsdk/fpdfxfa/fpdfxfa_page.h", "fpdfsdk/fpdfxfa/fpdfxfa_util.cpp", - "fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h", - "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h", - "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h", - "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h", - "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h", + "fpdfsdk/fpdfxfa/fpdfxfa_util.h", ] deps = [ ":fxcrt", diff --git a/fpdfsdk/cpdfsdk_annot.cpp b/fpdfsdk/cpdfsdk_annot.cpp index 7752cf120f..a6166efa72 100644 --- a/fpdfsdk/cpdfsdk_annot.cpp +++ b/fpdfsdk/cpdfsdk_annot.cpp @@ -12,7 +12,7 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 9dd5a4e46f..9057d6bed5 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -18,7 +18,7 @@ #include "fpdfsdk/include/cpdfsdk_widgethandler.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h" #include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp index 4f5213e42e..5811218417 100644 --- a/fpdfsdk/cpdfsdk_baannothandler.cpp +++ b/fpdfsdk/cpdfsdk_baannothandler.cpp @@ -18,7 +18,7 @@ #include "fpdfsdk/include/cpdfsdk_pageview.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/cpdfsdk_environment.cpp b/fpdfsdk/cpdfsdk_environment.cpp index 0f621eb887..94a89eea7c 100644 --- a/fpdfsdk/cpdfsdk_environment.cpp +++ b/fpdfsdk/cpdfsdk_environment.cpp @@ -15,7 +15,7 @@ #include "fpdfsdk/javascript/ijs_runtime.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index eb257cc581..b74f98a471 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -37,8 +37,8 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/cpdfsdk_xfawidget.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/xfa_ffdocview.h" diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index cb76a8a571..8144a91370 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -20,7 +20,7 @@ #include "fpdfsdk/include/cpdfsdk_interform.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "xfa/fxfa/include/xfa_ffdocview.h" #include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/include/xfa_ffwidgethandler.h" diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index d41f8927d7..b6d946597c 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -31,7 +31,7 @@ #include "fpdfsdk/pdfwindow/PWL_Utils.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/fxfa_widget.h" #include "xfa/fxfa/include/xfa_ffdocview.h" diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp index 208877edaf..9f945748e6 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.cpp +++ b/fpdfsdk/cpdfsdk_widgethandler.cpp @@ -21,7 +21,7 @@ #include "fpdfsdk/include/cpdfsdk_widget.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA CPDFSDK_WidgetHandler::CPDFSDK_WidgetHandler(CPDFSDK_Environment* pEnv) diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index 2abe9944f0..bf04707cd8 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -7,7 +7,7 @@ #include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index b77e751a38..fed0d8c55f 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -20,7 +20,7 @@ #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA FX_BOOL FPDF_UnSupportError(int nError) { diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index 354608dad1..e39b732272 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/fpdfxfa/include/fpdfxfa_app.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA class CPDF_TestDocument : public CPDF_Document { diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index acbb295a63..812035abcc 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -29,9 +29,9 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index dfa63da491..97730bad09 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -27,9 +27,9 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "xfa/fxfa/include/xfa_ffdocview.h" #include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index b6def4d8ff..c9872e2480 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -19,9 +19,9 @@ #include "public/fpdf_edit.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/xfa_checksum.h" diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 4a84c3589d..d2149eda6d 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -16,8 +16,8 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 50831d6d2e..a8a7a0b5ac 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -35,10 +35,10 @@ #include "third_party/base/numerics/safe_conversions_impl.h" #ifdef PDF_ENABLE_XFA -#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/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdfxfa/DEPS b/fpdfsdk/fpdfxfa/DEPS index 7f85f28f8b..b9a370408a 100644 --- a/fpdfsdk/fpdfxfa/DEPS +++ b/fpdfsdk/fpdfxfa/DEPS @@ -1,3 +1,4 @@ include_rules = [ + '+xfa/fwl/core/include', '+xfa/fxbarcode/include', ] diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index f51b02b4d8..3096b4ba8b 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h" +#include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h index 26ff86122a..5b6c89dd42 100644 --- a/fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FPDFXFA_INCLUDE_CPDFXFA_DOCENVIRONMENT_H_ -#define FPDFSDK_FPDFXFA_INCLUDE_CPDFXFA_DOCENVIRONMENT_H_ +#ifndef FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ +#define FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ #include "public/fpdfview.h" #include "xfa/fxfa/include/fxfa.h" @@ -109,4 +109,4 @@ class CPDFXFA_DocEnvironment : public IXFA_DocEnvironment { IJS_Context* m_pJSContext; }; -#endif // FPDFSDK_FPDFXFA_INCLUDE_CPDFXFA_DOCENVIRONMENT_H_ +#endif // FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index ccaceac413..28b9981d6c 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" #include <memory> -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/fsdk_define.h" #include "xfa/fxbarcode/include/BC_Library.h" diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/fpdfxfa_app.h index fefe088507..c8e00cbe0b 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ -#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ +#ifndef FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ +#define FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ #include "xfa/fxfa/include/fxfa.h" @@ -76,4 +76,4 @@ class CPDFXFA_App : public IXFA_AppProvider { CFX_WideString m_csAppType; }; -#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ +#endif // FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index 52a00e6126..f99fcb2716 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h index 5398c57519..3f3ea21a7d 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ -#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ +#ifndef FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_ +#define FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_ #include <memory> -#include "fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h" +#include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" #include "xfa/fxfa/include/xfa_ffdoc.h" class CPDFSDK_Document; @@ -92,4 +92,4 @@ class CPDFXFA_Document { CPDFXFA_DocEnvironment m_DocEnv; }; -#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_ +#endif // FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index a930404228..6f6b35239f 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/fpdfxfa/include/fpdfxfa_page.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" #include "xfa/fxfa/include/xfa_ffdocview.h" diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h b/fpdfsdk/fpdfxfa/fpdfxfa_page.h index bd60366a6b..cc622b7a40 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ -#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ +#ifndef FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_ +#define FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_ #include <memory> @@ -82,4 +82,4 @@ class CPDFXFA_Page { int m_iRef; }; -#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_PAGE_H_ +#endif // FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index 5b050afa35..13501df949 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/fpdfxfa/include/fpdfxfa_util.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include <vector> diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/fpdfxfa_util.h index fd7a678fdd..74f4f31d7c 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ -#define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ +#ifndef FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_ +#define FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_ #include <vector> -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "xfa/fwl/core/include/ifwl_adaptertimermgr.h" #define JS_STR_VIEWERTYPE_STANDARD L"Exchange" @@ -45,4 +45,4 @@ struct CFWL_TimerInfo : public IFWL_TimerInfo { IFWL_Timer* pTimer; }; -#endif // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_UTIL_H_ +#endif // FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_ diff --git a/fpdfsdk/fpdfxfa/include/DEPS b/fpdfsdk/fpdfxfa/include/DEPS deleted file mode 100644 index f207778cb2..0000000000 --- a/fpdfsdk/fpdfxfa/include/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+xfa/fwl/core/include", -] diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index ec99dbbf50..d6e98731d8 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -12,7 +12,7 @@ #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 0ca64b10f3..074061436a 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -32,7 +32,7 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" +#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" #include "fxjs/include/cfxjse_value.h" #endif // PDF_ENABLE_XFA |