From 27e364389e507f69ee9dc256cd4dbe558d05f887 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Fri, 13 Apr 2018 16:44:05 +0000 Subject: Hide XML parsing inside CXFA_XMLLocale This CL moves the parsing of the XML document into a static method of CXFA_XMLLocale. This removes the need for CXFA_LocaleMgr to care about the XML parser used. Change-Id: I04d14d78f458bfb37f0370fac2eb752e9840bfd6 Reviewed-on: https://pdfium-review.googlesource.com/30390 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_localemgr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_localemgr.cpp') diff --git a/xfa/fxfa/parser/cxfa_localemgr.cpp b/xfa/fxfa/parser/cxfa_localemgr.cpp index 277ba38eb9..5ad0ce2438 100644 --- a/xfa/fxfa/parser/cxfa_localemgr.cpp +++ b/xfa/fxfa/parser/cxfa_localemgr.cpp @@ -14,7 +14,6 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fxcodec/codec/ccodec_flatemodule.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/xml/cxml_element.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/parser/cxfa_acrobat.h" @@ -1080,10 +1079,9 @@ std::unique_ptr GetLocaleFromBuffer(const uint8_t* pBuf, if (!pOut) return nullptr; - std::unique_ptr pLocale = CXML_Element::Parse(pOut, dwSize); + auto locale = CXFA_XMLLocale::Create(pdfium::make_span(pOut, dwSize)); FX_Free(pOut); - return pLocale ? pdfium::MakeUnique(std::move(pLocale)) - : nullptr; + return locale; } uint16_t GetLanguage(WideString wsLanguage) { -- cgit v1.2.3