From bdbfc08f96f89581bea277d5ddd9755e893067d7 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 16 Apr 2018 17:59:07 +0000 Subject: Convert CXFA_XMLLocale to CFX_XML This CL converts CXFA_XMLLocale to use CFX_XML instead of CXML. Change-Id: I1db617a658548ae5979f2f38d72c5b3000998663 Reviewed-on: https://pdfium-review.googlesource.com/30693 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_xmllocale.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_xmllocale.h') diff --git a/xfa/fxfa/parser/cxfa_xmllocale.h b/xfa/fxfa/parser/cxfa_xmllocale.h index d1d21e83f1..92bd3607ec 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.h +++ b/xfa/fxfa/parser/cxfa_xmllocale.h @@ -13,13 +13,14 @@ #include "third_party/base/ptr_util.h" #include "third_party/base/span.h" -class CXML_Element; +class CFX_XMLElement; class CXFA_XMLLocale : public LocaleIface { public: static std::unique_ptr Create(pdfium::span data); - explicit CXFA_XMLLocale(std::unique_ptr pLocaleData); + explicit CXFA_XMLLocale(std::unique_ptr root, + CFX_XMLElement* locale); ~CXFA_XMLLocale() override; // LocaleIface @@ -38,14 +39,15 @@ class CXFA_XMLLocale : public LocaleIface { WideString GetNumPattern(FX_LOCALENUMSUBCATEGORY eType) const override; private: - WideString GetPattern(CXML_Element* pElement, - const ByteStringView& bsTag, + WideString GetPattern(CFX_XMLElement* pElement, + const WideStringView& bsTag, const WideStringView& wsName) const; - WideString GetCalendarSymbol(const ByteStringView& symbol, - int index, + WideString GetCalendarSymbol(const WideStringView& symbol, + size_t index, bool bAbbr) const; - std::unique_ptr m_pLocaleData; + std::unique_ptr xml_root_; + UnownedPtr locale_; }; #endif // XFA_FXFA_PARSER_CXFA_XMLLOCALE_H_ -- cgit v1.2.3