| Index: xfa/fxfa/parser/xfa_locale.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp
|
| index c721d7da17873ca78880a6473967feec440ad0f3..bad6c94fee9e381b446aa0311c0d0af942b7915e 100644
|
| --- a/xfa/fxfa/parser/xfa_locale.cpp
|
| +++ b/xfa/fxfa/parser/xfa_locale.cpp
|
| @@ -72,7 +72,7 @@ void CXFA_XMLLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType,
|
| default:
|
| return;
|
| }
|
| - CXML_Element* pElement = m_pLocaleData->GetElement("", bsSymbols);
|
| + CXML_Element* pElement = m_pLocaleData->GetObjectBy("", bsSymbols);
|
| if (!pElement) {
|
| return;
|
| }
|
| @@ -86,7 +86,7 @@ void CXFA_XMLLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const {
|
| }
|
| CFX_ByteString bsSpace;
|
| CXML_Element* pNumberSymbols =
|
| - m_pLocaleData->GetElement(bsSpace, "dateTimeSymbols");
|
| + m_pLocaleData->GetObjectBy(bsSpace, "dateTimeSymbols");
|
| if (!pNumberSymbols) {
|
| return;
|
| }
|
| @@ -119,16 +119,16 @@ CFX_WideString CXFA_XMLLocale::GetCalendarSymbol(const CFX_ByteStringC& symbol,
|
| CFX_ByteString pstrSymbolNames = symbol + "Names";
|
| CFX_WideString wsSymbolName = L"";
|
| if (m_pLocaleData) {
|
| - CXML_Element* pChild = m_pLocaleData->GetElement("", "calendarSymbols");
|
| + CXML_Element* pChild = m_pLocaleData->GetObjectBy("", "calendarSymbols");
|
| if (pChild) {
|
| - CXML_Element* pSymbolNames = pChild->GetElement("", pstrSymbolNames);
|
| + CXML_Element* pSymbolNames = pChild->GetObjectBy("", pstrSymbolNames);
|
| if (pSymbolNames) {
|
| if (pSymbolNames->GetAttrInteger("abbr") != bAbbr) {
|
| - pSymbolNames = pChild->GetElement("", pstrSymbolNames, 1);
|
| + pSymbolNames = pChild->GetObjectBy("", pstrSymbolNames, 1);
|
| }
|
| if (pSymbolNames && pSymbolNames->GetAttrInteger("abbr") == bAbbr) {
|
| CXML_Element* pSymbolName =
|
| - pSymbolNames->GetElement("", symbol, index);
|
| + pSymbolNames->GetObjectBy("", symbol, index);
|
| if (pSymbolName) {
|
| wsSymbolName = pSymbolName->GetContent(0);
|
| }
|
| @@ -140,7 +140,7 @@ CFX_WideString CXFA_XMLLocale::GetCalendarSymbol(const CFX_ByteStringC& symbol,
|
| }
|
| void CXFA_XMLLocale::GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType,
|
| CFX_WideString& wsPattern) const {
|
| - CXML_Element* pElement = m_pLocaleData->GetElement("", "datePatterns");
|
| + CXML_Element* pElement = m_pLocaleData->GetObjectBy("", "datePatterns");
|
| if (pElement == NULL) {
|
| return;
|
| }
|
| @@ -164,7 +164,7 @@ void CXFA_XMLLocale::GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType,
|
| }
|
| void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType,
|
| CFX_WideString& wsPattern) const {
|
| - CXML_Element* pElement = m_pLocaleData->GetElement("", "timePatterns");
|
| + CXML_Element* pElement = m_pLocaleData->GetObjectBy("", "timePatterns");
|
| if (pElement == NULL) {
|
| return;
|
| }
|
| @@ -188,7 +188,7 @@ void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType,
|
| }
|
| void CXFA_XMLLocale::GetNumPattern(FX_LOCALENUMSUBCATEGORY eType,
|
| CFX_WideString& wsPattern) const {
|
| - CXML_Element* pElement = m_pLocaleData->GetElement("", "numberPatterns");
|
| + CXML_Element* pElement = m_pLocaleData->GetObjectBy("", "numberPatterns");
|
| if (pElement == NULL) {
|
| return;
|
| }
|
| @@ -213,7 +213,7 @@ void CXFA_XMLLocale::GetPattern(CXML_Element* pElement,
|
| CFX_WideString& wsPattern) const {
|
| int32_t iCount = pElement->CountElements("", bsTag);
|
| for (int32_t i = 0; i < iCount; i++) {
|
| - CXML_Element* pChild = pElement->GetElement("", bsTag, i);
|
| + CXML_Element* pChild = pElement->GetObjectBy("", bsTag, i);
|
| if (pChild->GetAttrValue("name") == wsName) {
|
| wsPattern = pChild->GetContent(0);
|
| return;
|
|
|