From 5b4930967676088f2f0e5ce3b25aed77831d678c Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 20:20:24 -0700 Subject: Move xfa/fxfa/include to xfa/fxfa BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2383593002 --- fpdfsdk/DEPS | 2 +- fpdfsdk/cpdfsdk_annothandlermgr.cpp | 4 ++-- fpdfsdk/cpdfsdk_interform.cpp | 8 ++++---- fpdfsdk/cpdfsdk_pageview.cpp | 8 ++++---- fpdfsdk/cpdfsdk_widget.cpp | 10 +++++----- fpdfsdk/cpdfsdk_xfawidget.cpp | 2 +- fpdfsdk/cpdfsdk_xfawidgethandler.cpp | 10 +++++----- fpdfsdk/fpdfformfill.cpp | 6 +++--- fpdfsdk/fpdfsave.cpp | 10 +++++----- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 6 +++--- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h | 2 +- fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 4 ++-- fpdfsdk/fpdfxfa/fpdfxfa_app.h | 2 +- fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp | 12 ++++++------ fpdfsdk/fpdfxfa/fpdfxfa_doc.h | 2 +- fpdfsdk/fpdfxfa/fpdfxfa_page.cpp | 4 ++-- 16 files changed, 46 insertions(+), 46 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 840666d996..89f247e9fe 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -12,6 +12,6 @@ include_rules = [ '+public', '+v8', '+xfa/fwl/core', - '+xfa/fxfa/include', + '+xfa/fxfa', '+xfa/fxgraphics', ] diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 709c0806fd..0fac080886 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -20,8 +20,8 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/cpdfsdk_xfawidgethandler.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFSDK_Environment* pEnv) diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 7ecaeac310..855dc96da9 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -40,10 +40,10 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif // PDF_ENABLE_XFA CPDFSDK_InterForm::CPDFSDK_InterForm(CPDFSDK_Document* pDocument) diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 0e4266774c..bf4d8c6979 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -21,10 +21,10 @@ #ifdef PDF_ENABLE_XFA #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" -#include "xfa/fxfa/include/xfa_rendercontext.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/xfa_rendercontext.h" #include "xfa/fxgraphics/cfx_graphics.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index cbf69c4c48..76cfa2a1f8 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -32,11 +32,11 @@ #ifdef PDF_ENABLE_XFA #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" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/fxfa_widget.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/cpdfsdk_xfawidget.cpp b/fpdfsdk/cpdfsdk_xfawidget.cpp index 516f7bd3c0..de4bd23866 100644 --- a/fpdfsdk/cpdfsdk_xfawidget.cpp +++ b/fpdfsdk/cpdfsdk_xfawidget.cpp @@ -7,7 +7,7 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/ipdfsdk_annothandler.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidget.h" CPDFSDK_XFAWidget::CPDFSDK_XFAWidget(CXFA_FFWidget* pAnnot, CPDFSDK_PageView* pPageView, diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index 74a6a8e401..f21f4d2af9 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -15,11 +15,11 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "xfa/fwl/core/fwl_widgethit.h" -#include "xfa/fxfa/include/fxfa_basic.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/fxfa_basic.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #include "xfa/fxgraphics/cfx_graphics.h" CPDFSDK_XFAWidgetHandler::CPDFSDK_XFAWidgetHandler(CPDFSDK_Environment* pEnv) diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 2e497b27b1..8839a61afd 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -30,9 +30,9 @@ #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" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index e7d88f71c0..d0cdd89eab 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -23,11 +23,11 @@ #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" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_checksum.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 454f044ce4..207f320865 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -16,9 +16,9 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "fpdfsdk/javascript/ijs_runtime.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #define IDS_XFA_Validate_Input \ "At least one required field was empty. Please fill in the required " \ diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h index 5b6c89dd42..537e1ebed3 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h @@ -8,7 +8,7 @@ #define FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ #include "public/fpdfview.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CPDFXFA_Document; class IJS_Context; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 91dca08a86..88c31ef006 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/fsdk_define.h" #include "xfa/fxbarcode/BC_Library.h" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_fontmgr.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_fontmgr.h" namespace { diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/fpdfxfa_app.h index c8e00cbe0b..59cb220cee 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ #define FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CPDFSDK_Environment; class IFXJS_Runtime; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index e3e0d1c5a2..3bbcfe46bd 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -17,12 +17,12 @@ #include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "public/fpdf_formfill.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #ifndef _WIN32 extern void SetLastError(int err); diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h index 3f3ea21a7d..e3bafd7203 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h @@ -10,7 +10,7 @@ #include #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdoc.h" class CPDFSDK_Document; class CPDFSDK_Environment; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index 665467e6f1..fdbd2d08e4 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index) : m_pXFAPageView(nullptr), -- cgit v1.2.3