| Index: xfa/fgas/localization/fgas_locale.cpp
|
| diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp
|
| index a6443f4de790156773b0566aa867b0826528a30c..07cc024cfd24a768da810755d041b678c77cc84a 100644
|
| --- a/xfa/fgas/localization/fgas_locale.cpp
|
| +++ b/xfa/fgas/localization/fgas_locale.cpp
|
| @@ -94,7 +94,7 @@ static CFX_WideString FX_GetXMLContent(const CFX_ByteStringC& bsSpace,
|
| int32_t nCount = pxmlElement->CountElements(bsSpace, bsTag);
|
| int32_t i = 0;
|
| for (; i < nCount; i++) {
|
| - pDatePattern = pxmlElement->GetElement(bsSpace, bsTag, i);
|
| + pDatePattern = pxmlElement->GetObjectBy(bsSpace, bsTag, i);
|
| if (pDatePattern->GetAttrValue("name") == wsName) {
|
| break;
|
| }
|
| @@ -112,7 +112,7 @@ void CFX_Locale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType,
|
| CFX_ByteString bsSpace;
|
| CFX_WideString wsName = gs_LocalNumberSymbols[eType];
|
| CXML_Element* pNumberSymbols =
|
| - m_pElement->GetElement(bsSpace, "numberSymbols");
|
| + m_pElement->GetObjectBy(bsSpace, "numberSymbols");
|
| if (!pNumberSymbols) {
|
| return;
|
| }
|
| @@ -125,7 +125,7 @@ void CFX_Locale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const {
|
| }
|
| CFX_ByteString bsSpace;
|
| CXML_Element* pNumberSymbols =
|
| - m_pElement->GetElement(bsSpace, "dateTimeSymbols");
|
| + m_pElement->GetObjectBy(bsSpace, "dateTimeSymbols");
|
| if (!pNumberSymbols) {
|
| return;
|
| }
|
| @@ -138,20 +138,20 @@ static void FX_GetCalendarSymbol(CXML_Element* pXmlElement,
|
| CFX_WideString& wsName) {
|
| CFX_ByteString bsSpace;
|
| CFX_ByteString pstrSymbolNames = symbol_type + "Names";
|
| - CXML_Element* pChild = pXmlElement->GetElement(bsSpace, "calendarSymbols");
|
| + CXML_Element* pChild = pXmlElement->GetObjectBy(bsSpace, "calendarSymbols");
|
| if (!pChild) {
|
| return;
|
| }
|
| - CXML_Element* pSymbolNames = pChild->GetElement(bsSpace, pstrSymbolNames);
|
| + CXML_Element* pSymbolNames = pChild->GetObjectBy(bsSpace, pstrSymbolNames);
|
| if (!pSymbolNames) {
|
| return;
|
| }
|
| if (pSymbolNames->GetAttrInteger("abbr") != bAbbr) {
|
| - pSymbolNames = pChild->GetElement(bsSpace, pstrSymbolNames, 1);
|
| + pSymbolNames = pChild->GetObjectBy(bsSpace, pstrSymbolNames, 1);
|
| }
|
| if (pSymbolNames && pSymbolNames->GetAttrInteger("abbr") == bAbbr) {
|
| CXML_Element* pSymbolName =
|
| - pSymbolNames->GetElement(bsSpace, symbol_type, index);
|
| + pSymbolNames->GetObjectBy(bsSpace, symbol_type, index);
|
| if (pSymbolName) {
|
| wsName = pSymbolName->GetContent(0);
|
| }
|
| @@ -212,7 +212,7 @@ void CFX_Locale::GetTimeZone(FX_TIMEZONE& tz) const {
|
| if (!m_pElement) {
|
| return;
|
| }
|
| - CXML_Element* pxmlTimeZone = m_pElement->GetElement("", "timeZone");
|
| + CXML_Element* pxmlTimeZone = m_pElement->GetObjectBy("", "timeZone");
|
| if (pxmlTimeZone) {
|
| CFX_WideString wsTimeZone = pxmlTimeZone->GetContent(0);
|
| FX_ParseTimeZone(wsTimeZone, wsTimeZone.GetLength(), tz);
|
| @@ -230,7 +230,7 @@ static void FX_GetPattern(CXML_Element* pXmlElement,
|
| CFX_WideString& wsPattern) {
|
| CFX_ByteString bsSpace;
|
| CXML_Element* pDatePatterns =
|
| - pXmlElement->GetElement(bsSpace, bsCategory + "s");
|
| + pXmlElement->GetObjectBy(bsSpace, bsCategory + "s");
|
| if (!pDatePatterns) {
|
| return;
|
| }
|
|
|