From b929ab0886a2b0ceb701989ef126e5b0cabf6997 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 29 Mar 2017 15:18:16 -0400 Subject: Remove fgas/localization directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl moves the CFX_DateTime, CFX_Decimal and IFX_Locale files into core/fxcrt and builds only for XFA. The CFX_FormatString code is moved info fgas/crt and renamed CFGAS_FormatString to match the fgas naming. Change-Id: I8d9061195d2225da0389cbc9d018fcbd2e9a3c0c Reviewed-on: https://pdfium-review.googlesource.com/3257 Commit-Queue: dsinclair Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña --- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 2 +- xfa/fxfa/parser/cxfa_localemgr.cpp | 1 - xfa/fxfa/parser/cxfa_localemgr.h | 4 ++-- xfa/fxfa/parser/cxfa_localevalue.cpp | 10 +++++----- xfa/fxfa/parser/cxfa_node.cpp | 2 +- xfa/fxfa/parser/cxfa_nodelocale.h | 2 +- xfa/fxfa/parser/cxfa_timezoneprovider.h | 2 +- xfa/fxfa/parser/cxfa_widgetdata.cpp | 2 +- xfa/fxfa/parser/cxfa_xmllocale.h | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index bbda9ee9f4..b95a6d3aab 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -10,13 +10,13 @@ #include +#include "core/fxcrt/cfx_decimal.h" #include "core/fxcrt/fx_ext.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_value.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" -#include "xfa/fgas/localization/cfx_decimal.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/fm2js/xfa_program.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_localemgr.cpp b/xfa/fxfa/parser/cxfa_localemgr.cpp index ddcee39b0d..ec29c5605b 100644 --- a/xfa/fxfa/parser/cxfa_localemgr.cpp +++ b/xfa/fxfa/parser/cxfa_localemgr.cpp @@ -14,7 +14,6 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_xml.h" #include "core/fxge/cfx_gemodule.h" -#include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_nodelocale.h" #include "xfa/fxfa/parser/cxfa_xmllocale.h" diff --git a/xfa/fxfa/parser/cxfa_localemgr.h b/xfa/fxfa/parser/cxfa_localemgr.h index 4151317300..307cc621d0 100644 --- a/xfa/fxfa/parser/cxfa_localemgr.h +++ b/xfa/fxfa/parser/cxfa_localemgr.h @@ -10,8 +10,8 @@ #include #include -#include "xfa/fgas/localization/cfx_datetime.h" -#include "xfa/fgas/localization/ifx_locale.h" +#include "core/fxcrt/cfx_datetime.h" +#include "core/fxcrt/ifx_locale.h" #include "xfa/fxfa/parser/cxfa_localemgr.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_localevalue.cpp b/xfa/fxfa/parser/cxfa_localevalue.cpp index e66e55330f..67780924c2 100644 --- a/xfa/fxfa/parser/cxfa_localevalue.cpp +++ b/xfa/fxfa/parser/cxfa_localevalue.cpp @@ -11,7 +11,7 @@ #include "core/fxcrt/fx_ext.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" -#include "xfa/fgas/localization/cfx_formatstring.h" +#include "xfa/fgas/crt/cfgas_formatstring.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_localemgr.h" #include "xfa/fxfa/parser/xfa_utils.h" @@ -90,7 +90,7 @@ bool CXFA_LocaleValue::ValidateValue(const CFX_WideString& wsValue, if (pLocale) m_pLocaleMgr->SetDefLocale(pLocale); - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); std::vector wsPatterns; pFormat->SplitFormatString(wsPattern, wsPatterns); @@ -464,7 +464,7 @@ bool CXFA_LocaleValue::FormatPatterns(CFX_WideString& wsResult, const CFX_WideString& wsFormat, IFX_Locale* pLocale, XFA_VALUEPICTURE eValueType) const { - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); std::vector wsPatterns; pFormat->SplitFormatString(wsFormat, wsPatterns); wsResult.clear(); @@ -486,7 +486,7 @@ bool CXFA_LocaleValue::FormatSinglePattern(CFX_WideString& wsResult, wsResult.clear(); bool bRet = false; - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); FX_LOCALECATEGORY eCategory = pFormat->GetCategory(wsFormat); eCategory = XFA_ValugeCategory(eCategory, m_dwType); switch (eCategory) { @@ -795,7 +795,7 @@ bool CXFA_LocaleValue::ParsePatternValue(const CFX_WideString& wsValue, if (pLocale) m_pLocaleMgr->SetDefLocale(pLocale); - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); std::vector wsPatterns; pFormat->SplitFormatString(wsPattern, wsPatterns); bool bRet = false; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index cd65f6a798..75a125b2d9 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -12,13 +12,13 @@ #include #include +#include "core/fxcrt/cfx_decimal.h" #include "core/fxcrt/fx_ext.h" #include "fxjs/cfxjse_value.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" -#include "xfa/fgas/localization/cfx_decimal.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/cxfa_ffwidget.h" diff --git a/xfa/fxfa/parser/cxfa_nodelocale.h b/xfa/fxfa/parser/cxfa_nodelocale.h index dbecdca6a0..2465650b47 100644 --- a/xfa/fxfa/parser/cxfa_nodelocale.h +++ b/xfa/fxfa/parser/cxfa_nodelocale.h @@ -9,7 +9,7 @@ #include -#include "xfa/fgas/localization/ifx_locale.h" +#include "core/fxcrt/ifx_locale.h" #include "xfa/fxfa/fxfa_basic.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_timezoneprovider.h b/xfa/fxfa/parser/cxfa_timezoneprovider.h index eace151987..753fbb74da 100644 --- a/xfa/fxfa/parser/cxfa_timezoneprovider.h +++ b/xfa/fxfa/parser/cxfa_timezoneprovider.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_TIMEZONEPROVIDER_H_ #define XFA_FXFA_PARSER_CXFA_TIMEZONEPROVIDER_H_ -#include "xfa/fgas/localization/cfx_datetime.h" +#include "core/fxcrt/cfx_datetime.h" class CXFA_TimeZoneProvider { public: diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index d6fb3a9757..0065296776 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -6,9 +6,9 @@ #include "xfa/fxfa/parser/cxfa_widgetdata.h" +#include "core/fxcrt/cfx_decimal.h" #include "core/fxcrt/fx_ext.h" #include "third_party/base/stl_util.h" -#include "xfa/fgas/localization/cfx_decimal.h" #include "xfa/fxbarcode/BC_Library.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_xmllocale.h b/xfa/fxfa/parser/cxfa_xmllocale.h index 374dab0197..a58385601c 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.h +++ b/xfa/fxfa/parser/cxfa_xmllocale.h @@ -9,7 +9,7 @@ #include -#include "xfa/fgas/localization/ifx_locale.h" +#include "core/fxcrt/ifx_locale.h" class CXML_Element; -- cgit v1.2.3