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/parser/cxfa_localevalue.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_localevalue.cpp') 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; -- cgit v1.2.3