diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-04 16:41:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-04 16:41:35 -0700 |
| commit | 28f97ff783c16f3391384ce97b765ce4eb310ac7 (patch) | |
| tree | 69c4c8bc9dd39d5336c96f28b633d197dd207c81 /xfa/fxfa/parser/xfa_locale.cpp | |
| parent | ed9c4386713084f37548b46ab36f618021f716f5 (diff) | |
| download | pdfium-28f97ff783c16f3391384ce97b765ce4eb310ac7.tar.xz | |
Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.
Having this happen implicitly can be dangerous because the lifetime
has to be considered; we should have caught the "red bots" in
https://codereview.chromium.org/1847333004/#ps60001 at compile time.
Review URL: https://codereview.chromium.org/1853233002
Diffstat (limited to 'xfa/fxfa/parser/xfa_locale.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_locale.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp index 35d8c36fa2..141e295be9 100644 --- a/xfa/fxfa/parser/xfa_locale.cpp +++ b/xfa/fxfa/parser/xfa_locale.cpp @@ -72,7 +72,8 @@ void CXFA_XMLLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, default: return; } - CXML_Element* pElement = m_pLocaleData->GetElement("", bsSymbols); + CXML_Element* pElement = + m_pLocaleData->GetElement("", bsSymbols.AsByteStringC()); if (!pElement) { return; } @@ -86,7 +87,7 @@ void CXFA_XMLLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const { } CFX_ByteString bsSpace; CXML_Element* pNumberSymbols = - m_pLocaleData->GetElement(bsSpace, "dateTimeSymbols"); + m_pLocaleData->GetElement(bsSpace.AsByteStringC(), "dateTimeSymbols"); if (!pNumberSymbols) { return; } @@ -120,10 +121,12 @@ CFX_WideString CXFA_XMLLocale::GetCalendarSymbol(const CFX_ByteStringC& symbol, if (m_pLocaleData) { CXML_Element* pChild = m_pLocaleData->GetElement("", "calendarSymbols"); if (pChild) { - CXML_Element* pSymbolNames = pChild->GetElement("", pstrSymbolNames); + CXML_Element* pSymbolNames = + pChild->GetElement("", pstrSymbolNames.AsByteStringC()); if (pSymbolNames) { if (pSymbolNames->GetAttrInteger("abbr") != bAbbr) { - pSymbolNames = pChild->GetElement("", pstrSymbolNames, 1); + pSymbolNames = + pChild->GetElement("", pstrSymbolNames.AsByteStringC(), 1); } if (pSymbolNames && pSymbolNames->GetAttrInteger("abbr") == bAbbr) { CXML_Element* pSymbolName = |