diff options
Diffstat (limited to 'xfa/fxfa')
60 files changed, 70 insertions, 70 deletions
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index ffbd7ce505..927f38b35b 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/app/xfa_ffbarcode.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/lightwidget/cfwl_barcode.h" diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index f9b92c6f6d..c75c84adc0 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_nametree.h" -#include "core/fxcrt/include/fx_ext.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_ext.h" +#include "core/fxcrt/fx_memory.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fxfa/app/xfa_ffnotify.h" diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index 7dff9d44f4..939fc099ff 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/include/xfa_ffdocview.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/app/xfa_ffbarcode.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" #include "xfa/fxfa/app/xfa_ffchoicelist.h" diff --git a/xfa/fxfa/app/xfa_fwladapter.h b/xfa/fxfa/app/xfa_fwladapter.h index 00e76db227..0fbf0d9ee7 100644 --- a/xfa/fxfa/app/xfa_fwladapter.h +++ b/xfa/fxfa/app/xfa_fwladapter.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FWLADAPTER_H_ #define XFA_FXFA_APP_XFA_FWLADAPTER_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" class IFWL_Widget; diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index 780ade3612..fcda599125 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -8,7 +8,7 @@ #include <algorithm> -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/css/fde_csscache.h" #include "xfa/fde/css/fde_cssstyleselector.h" diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/xfa_error.h index 6ce102e03e..5e3fbbe1ba 100644 --- a/xfa/fxfa/fm2js/xfa_error.h +++ b/xfa/fxfa/fm2js/xfa_error.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_FM2JS_XFA_ERROR_H_ #define XFA_FXFA_FM2JS_XFA_ERROR_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" extern const FX_WCHAR kFMErrUnsupportedChar[]; extern const FX_WCHAR kFMErrBadSuffixNumber[]; diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index 22e627d72d..829bf7d74e 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/fm2js/xfa_expression.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" namespace { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 0d735a1b9b..d8d29ec2c5 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -8,7 +8,7 @@ #include <time.h> -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fxjs/include/cfxjse_arguments.h" #include "fxjs/include/cfxjse_class.h" #include "fxjs/include/cfxjse_value.h" diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp index e480b37d4c..2e8b6fed59 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.cpp +++ b/xfa/fxfa/fm2js/xfa_lexer.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/fm2js/xfa_lexer.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" namespace { diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h index a910d1790c..220a4d7630 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.h +++ b/xfa/fxfa/fm2js/xfa_lexer.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/fm2js/xfa_error.h" enum XFA_FM_TOKEN { diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp index 089333b774..fdae9fc772 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/fm2js/xfa_simpleexpression.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" namespace { diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h index 857cd518cf..f0f2f390d5 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.h +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fxfa/fm2js/xfa_lexer.h" #define RUNTIMEFUNCTIONRETURNVALUE \ diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index fa6d7fa49d..9bab36f806 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ #define XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_coordinates.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxfa/parser/cxfa_box.h" #include "xfa/fxfa/parser/cxfa_event.h" diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h index 6147dbc5c7..a996adc2ed 100644 --- a/xfa/fxfa/include/xfa_fontmgr.h +++ b/xfa/fxfa/include/xfa_fontmgr.h @@ -10,8 +10,8 @@ #include <map> #include <memory> -#include "core/fxcrt/include/fx_ext.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_ext.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fgas/font/fgas_font.h" #include "xfa/fxfa/include/fxfa.h" diff --git a/xfa/fxfa/parser/cxfa_bind.h b/xfa/fxfa/parser/cxfa_bind.h index 2e2954eae2..40a2a1a482 100644 --- a/xfa/fxfa/parser/cxfa_bind.h +++ b/xfa/fxfa/parser/cxfa_bind.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_BIND_H_ #define XFA_FXFA_PARSER_CXFA_BIND_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_binditems.h b/xfa/fxfa/parser/cxfa_binditems.h index 3dc0b28878..cb47cf02f1 100644 --- a/xfa/fxfa/parser/cxfa_binditems.h +++ b/xfa/fxfa/parser/cxfa_binditems.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ #define XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_box.h b/xfa/fxfa/parser/cxfa_box.h index 56c15a2c6b..5cf141271d 100644 --- a/xfa/fxfa/parser/cxfa_box.h +++ b/xfa/fxfa/parser/cxfa_box.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_BOX_H_ #define XFA_FXFA_PARSER_CXFA_BOX_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_edge.h" #include "xfa/fxfa/parser/cxfa_fill.h" diff --git a/xfa/fxfa/parser/cxfa_calculate.h b/xfa/fxfa/parser/cxfa_calculate.h index c90656a314..1012224069 100644 --- a/xfa/fxfa/parser/cxfa_calculate.h +++ b/xfa/fxfa/parser/cxfa_calculate.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_CALCULATE_H_ #define XFA_FXFA_PARSER_CXFA_CALCULATE_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_script.h" diff --git a/xfa/fxfa/parser/cxfa_data.cpp b/xfa/fxfa/parser/cxfa_data.cpp index 75ec09c7e8..5f059a7dfe 100644 --- a/xfa/fxfa/parser/cxfa_data.cpp +++ b/xfa/fxfa/parser/cxfa_data.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_data.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index afb6c3b675..8432cf4a29 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_DATA_H_ #define XFA_FXFA_PARSER_CXFA_DATA_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index fbb9e70b94..8f47b5324d 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_dataexporter.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h index 3049ae2d02..868c20e294 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.h +++ b/xfa/fxfa/parser/cxfa_dataexporter.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_ #define XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CXFA_Document; class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp index 87848ddebb..c5bcc99cb9 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp @@ -8,7 +8,7 @@ #include <memory> -#include "core/fxcrt/include/fx_stream.h" +#include "core/fxcrt/fx_stream.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/include/fxfa_basic.h" diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h index b5648218e9..519fef4410 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.h +++ b/xfa/fxfa/parser/cxfa_dataimporter.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_ #define XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CXFA_Document; class IFX_FileRead; diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index a80d842325..a644c6a92e 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/cscript_datawindow.h" #include "xfa/fxfa/parser/cscript_eventpseudomodel.h" diff --git a/xfa/fxfa/parser/cxfa_event.h b/xfa/fxfa/parser/cxfa_event.h index de3598de46..b151b399b5 100644 --- a/xfa/fxfa/parser/cxfa_event.h +++ b/xfa/fxfa/parser/cxfa_event.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_script.h" #include "xfa/fxfa/parser/cxfa_submit.h" diff --git a/xfa/fxfa/parser/cxfa_exdata.h b/xfa/fxfa/parser/cxfa_exdata.h index eb04398379..c5eddbf14c 100644 --- a/xfa/fxfa/parser/cxfa_exdata.h +++ b/xfa/fxfa/parser/cxfa_exdata.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_EXDATA_H_ #define XFA_FXFA_PARSER_CXFA_EXDATA_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_fill.h b/xfa/fxfa/parser/cxfa_fill.h index c8f1cb3013..70b0886c85 100644 --- a/xfa/fxfa/parser/cxfa_fill.h +++ b/xfa/fxfa/parser/cxfa_fill.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_FILL_H_ #define XFA_FXFA_PARSER_CXFA_FILL_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxfa/parser/cxfa_data.h" diff --git a/xfa/fxfa/parser/cxfa_image.h b/xfa/fxfa/parser/cxfa_image.h index 9f8b3bb228..4b088c8f90 100644 --- a/xfa/fxfa/parser/cxfa_image.h +++ b/xfa/fxfa/parser/cxfa_image.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_IMAGE_H_ #define XFA_FXFA_PARSER_CXFA_IMAGE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.h b/xfa/fxfa/parser/cxfa_layoutprocessor.h index 1e66402720..365c5f2965 100644 --- a/xfa/fxfa/parser/cxfa_layoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_LAYOUTPROCESSOR_H_ #define XFA_FXFA_PARSER_CXFA_LAYOUTPROCESSOR_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/xfa_object.h" class CXFA_ContainerLayoutItem; diff --git a/xfa/fxfa/parser/cxfa_line.h b/xfa/fxfa/parser/cxfa_line.h index 3807604853..1d91a5970b 100644 --- a/xfa/fxfa/parser/cxfa_line.h +++ b/xfa/fxfa/parser/cxfa_line.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_LINE_H_ #define XFA_FXFA_PARSER_CXFA_LINE_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_edge.h" diff --git a/xfa/fxfa/parser/cxfa_margin.h b/xfa/fxfa/parser/cxfa_margin.h index ecfc628b89..780f9b2b68 100644 --- a/xfa/fxfa/parser/cxfa_margin.h +++ b/xfa/fxfa/parser/cxfa_margin.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_MARGIN_H_ #define XFA_FXFA_PARSER_CXFA_MARGIN_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp index 90726b249e..cd34f8af25 100644 --- a/xfa/fxfa/parser/cxfa_measurement.cpp +++ b/xfa/fxfa/parser/cxfa_measurement.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_measurement.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" CXFA_Measurement::CXFA_Measurement(const CFX_WideStringC& wsMeasure) { Set(wsMeasure); diff --git a/xfa/fxfa/parser/cxfa_measurement.h b/xfa/fxfa/parser/cxfa_measurement.h index 744cc2bcf7..d1b83bda40 100644 --- a/xfa/fxfa/parser/cxfa_measurement.h +++ b/xfa/fxfa/parser/cxfa_measurement.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_MEASUREMENT_H_ #define XFA_FXFA_PARSER_CXFA_MEASUREMENT_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/include/fxfa_basic.h" class CXFA_Measurement { diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 793e37bee2..dae40ac515 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -9,7 +9,7 @@ #include <map> #include <memory> -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fxjs/include/cfxjse_value.h" #include "third_party/base/stl_util.h" #include "xfa/fde/xml/fde_xml_imp.h" diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index 4fc6830a73..27b8b038aa 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_nodehelper.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_localemgr.h" diff --git a/xfa/fxfa/parser/cxfa_nodelist.cpp b/xfa/fxfa/parser/cxfa_nodelist.cpp index 86575e6b3f..df6cd408e4 100644 --- a/xfa/fxfa/parser/cxfa_nodelist.cpp +++ b/xfa/fxfa/parser/cxfa_nodelist.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_object.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp index 78f39ee6bc..7f35c73a20 100644 --- a/xfa/fxfa/parser/cxfa_object.cpp +++ b/xfa/fxfa/parser/cxfa_object.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_object.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fxjs/include/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_occur.h b/xfa/fxfa/parser/cxfa_occur.h index 0f10540b92..58b44b9135 100644 --- a/xfa/fxfa/parser/cxfa_occur.h +++ b/xfa/fxfa/parser/cxfa_occur.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_OCCUR_H_ #define XFA_FXFA_PARSER_CXFA_OCCUR_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_para.h b/xfa/fxfa/parser/cxfa_para.h index 109d05d2f0..e12d48f9fa 100644 --- a/xfa/fxfa/parser/cxfa_para.h +++ b/xfa/fxfa/parser/cxfa_para.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_PARA_H_ #define XFA_FXFA_PARSER_CXFA_PARA_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_resolveprocessor.cpp b/xfa/fxfa/parser/cxfa_resolveprocessor.cpp index 60f3671418..823e884821 100644 --- a/xfa/fxfa/parser/cxfa_resolveprocessor.cpp +++ b/xfa/fxfa/parser/cxfa_resolveprocessor.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_resolveprocessor.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_nodehelper.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" diff --git a/xfa/fxfa/parser/cxfa_script.h b/xfa/fxfa/parser/cxfa_script.h index f265961b07..d89062487d 100644 --- a/xfa/fxfa/parser/cxfa_script.h +++ b/xfa/fxfa/parser/cxfa_script.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" enum XFA_SCRIPTTYPE { diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index 22e24c5445..a1a45ab127 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_scriptcontext.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fxjs/include/cfxjse_arguments.h" #include "fxjs/include/cfxjse_class.h" #include "fxjs/include/cfxjse_value.h" diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 008ca53f29..3f431e08b3 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_simple_parser.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/include/xfa_checksum.h" diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 6bfc409af7..7d817e0fea 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_STROKE_H_ #define XFA_FXFA_PARSER_CXFA_STROKE_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h" diff --git a/xfa/fxfa/parser/cxfa_submit.h b/xfa/fxfa/parser/cxfa_submit.h index 598431102d..29cd1cff80 100644 --- a/xfa/fxfa/parser/cxfa_submit.h +++ b/xfa/fxfa/parser/cxfa_submit.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_SUBMIT_H_ #define XFA_FXFA_PARSER_CXFA_SUBMIT_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_text.h b/xfa/fxfa/parser/cxfa_text.h index 7467647791..ca41c0dbb4 100644 --- a/xfa/fxfa/parser/cxfa_text.h +++ b/xfa/fxfa/parser/cxfa_text.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_TEXT_H_ #define XFA_FXFA_PARSER_CXFA_TEXT_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_tooltip.h b/xfa/fxfa/parser/cxfa_tooltip.h index af1791e2ec..93ba2ba72c 100644 --- a/xfa/fxfa/parser/cxfa_tooltip.h +++ b/xfa/fxfa/parser/cxfa_tooltip.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_TOOLTIP_H_ #define XFA_FXFA_PARSER_CXFA_TOOLTIP_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h index bdd7be98b2..da9654a5a0 100644 --- a/xfa/fxfa/parser/cxfa_validate.h +++ b/xfa/fxfa/parser/cxfa_validate.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_VALIDATE_H_ #define XFA_FXFA_PARSER_CXFA_VALIDATE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_script.h" diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h index 69697c150a..c3a03950ec 100644 --- a/xfa/fxfa/parser/cxfa_value.h +++ b/xfa/fxfa/parser/cxfa_value.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_VALUE_H_ #define XFA_FXFA_PARSER_CXFA_VALUE_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_arc.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_exdata.h" diff --git a/xfa/fxfa/parser/cxfa_widetextread.cpp b/xfa/fxfa/parser/cxfa_widetextread.cpp index 90abe9af53..7c6487db6a 100644 --- a/xfa/fxfa/parser/cxfa_widetextread.cpp +++ b/xfa/fxfa/parser/cxfa_widetextread.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_widetextread.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" CXFA_WideTextRead::CXFA_WideTextRead(const CFX_WideString& wsBuffer) diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 561a5df92d..4e02087ebd 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_widgetdata.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index 51e8672e39..f718b6ee59 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_WIDGETDATA_H_ #define XFA_FXFA_PARSER_CXFA_WIDGETDATA_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_assist.h" #include "xfa/fxfa/parser/cxfa_bind.h" #include "xfa/fxfa/parser/cxfa_border.h" diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index ea2f31671f..8d50a5a96d 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_document_datamerger_imp.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.h b/xfa/fxfa/parser/xfa_layout_itemlayout.h index a1344ba53a..ee9e29d8b4 100644 --- a/xfa/fxfa/parser/xfa_layout_itemlayout.h +++ b/xfa/fxfa/parser/xfa_layout_itemlayout.h @@ -12,7 +12,7 @@ #include <list> #include <map> -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fxfa/include/fxfa_basic.h" #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1) diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp index 686af80576..19511bebce 100644 --- a/xfa/fxfa/parser/xfa_locale.cpp +++ b/xfa/fxfa/parser/xfa_locale.cpp @@ -8,7 +8,7 @@ #include <utility> -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_xml.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 9b444defee..0bcfe0b5e0 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -10,7 +10,7 @@ #include <utility> #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_xml.h" #include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_locale.h" diff --git a/xfa/fxfa/parser/xfa_localevalue.cpp b/xfa/fxfa/parser/xfa_localevalue.cpp index 0324c569f3..27f3b0cf3f 100644 --- a/xfa/fxfa/parser/xfa_localevalue.cpp +++ b/xfa/fxfa/parser/xfa_localevalue.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_localevalue.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fgas/localization/fgas_localeimp.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" diff --git a/xfa/fxfa/parser/xfa_localevalue.h b/xfa/fxfa/parser/xfa_localevalue.h index 83885bd56d..f278c07105 100644 --- a/xfa/fxfa/parser/xfa_localevalue.h +++ b/xfa/fxfa/parser/xfa_localevalue.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_ #define XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_widgetdata.h" class IFX_Locale; diff --git a/xfa/fxfa/parser/xfa_utils.cpp b/xfa/fxfa/parser/xfa_utils.cpp index da5b68516b..3967784fe9 100644 --- a/xfa/fxfa/parser/xfa_utils.cpp +++ b/xfa/fxfa/parser/xfa_utils.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_utils.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_measurement.h" |