From 939121f33f9bb02c207094b5b3e78e69be992b84 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Mar 2017 16:55:43 -0400 Subject: Cleanup some fgas locale code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl cleans up a bit of the locale code in fgas, removing unused code and cleaning up some of the other code. Change-Id: Ieb18df552cf5d803c1bbdbfe11a4f5a88c4b3af3 Reviewed-on: https://pdfium-review.googlesource.com/3094 Commit-Queue: dsinclair Reviewed-by: Nicolás Peña --- xfa/fxfa/parser/xfa_localemgr.h | 15 +++++++-------- xfa/fxfa/parser/xfa_localevalue.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/parser/xfa_localemgr.h b/xfa/fxfa/parser/xfa_localemgr.h index eb405dcfc7..3336d713e0 100644 --- a/xfa/fxfa/parser/xfa_localemgr.h +++ b/xfa/fxfa/parser/xfa_localemgr.h @@ -33,21 +33,20 @@ class IFX_Locale; #define XFA_LANGID_nl_NL 0x0413 #define XFA_LANGID_ru_RU 0x0419 -class CXFA_LocaleMgr : public IFX_LocaleMgr { +class CXFA_LocaleMgr { public: CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid); - ~CXFA_LocaleMgr() override; + ~CXFA_LocaleMgr(); - // IFX_LocaleMgr - uint16_t GetDefLocaleID() const override; - IFX_Locale* GetDefLocale() override; - IFX_Locale* GetLocaleByName(const CFX_WideString& wsLocaleName) override; + uint16_t GetDefLocaleID() const; + IFX_Locale* GetDefLocale(); + IFX_Locale* GetLocaleByName(const CFX_WideString& wsLocaleName); void SetDefLocale(IFX_Locale* pLocale); CFX_WideStringC GetConfigLocaleName(CXFA_Node* pConfig); - protected: - std::unique_ptr GetLocale(uint16_t lcid) override; + private: + std::unique_ptr GetLocale(uint16_t lcid); std::vector> m_LocaleArray; std::vector> m_XMLLocaleArray; diff --git a/xfa/fxfa/parser/xfa_localevalue.cpp b/xfa/fxfa/parser/xfa_localevalue.cpp index 0e7b8c9c2f..1012896089 100644 --- a/xfa/fxfa/parser/xfa_localevalue.cpp +++ b/xfa/fxfa/parser/xfa_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/fgas_localeimp.h" +#include "xfa/fgas/localization/cfx_formatstring.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" @@ -91,7 +91,7 @@ bool CXFA_LocaleValue::ValidateValue(const CFX_WideString& wsValue, if (pLocale) m_pLocaleMgr->SetDefLocale(pLocale); - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr, false); + 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, false); + 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, false); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); FX_LOCALECATEGORY eCategory = pFormat->GetCategory(wsFormat); eCategory = XFA_ValugeCategory(eCategory, m_dwType); switch (eCategory) { @@ -793,7 +793,7 @@ bool CXFA_LocaleValue::ParsePatternValue(const CFX_WideString& wsValue, if (pLocale) m_pLocaleMgr->SetDefLocale(pLocale); - auto pFormat = pdfium::MakeUnique(m_pLocaleMgr, false); + auto pFormat = pdfium::MakeUnique(m_pLocaleMgr); std::vector wsPatterns; pFormat->SplitFormatString(wsPattern, wsPatterns); bool bRet = false; -- cgit v1.2.3