From fc58ad18b7ab32e7b0bb3959b07dbe7538a7cebd Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 5 Apr 2016 12:22:15 -0700 Subject: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. Companion to https://codereview.chromium.org/1853233002 BUG= Review URL: https://codereview.chromium.org/1857073002 --- core/fxcrt/fx_xml_parser.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/fxcrt/fx_xml_parser.cpp') diff --git a/core/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp index b39c32bfbd..d59a6b9780 100644 --- a/core/fxcrt/fx_xml_parser.cpp +++ b/core/fxcrt/fx_xml_parser.cpp @@ -398,7 +398,8 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, CFX_WideString attr_value; GetAttrValue(attr_value); pElement->m_AttrMap.SetAt(attr_space.AsByteStringC(), - attr_name.AsByteStringC(), attr_value); + attr_name.AsByteStringC(), + attr_value.AsWideStringC()); } m_nOffset = m_nBufferOffset + (FX_FILESIZE)m_dwIndex; if (m_dwIndex < m_dwBufferSize || IsEOF()) { @@ -461,7 +462,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, if (!bCDATA && !m_bSaveSpaceChars) { dataStr.TrimRight(L" \t\r\n"); } - InsertContentSegment(bCDATA, dataStr, pElement); + InsertContentSegment(bCDATA, dataStr.AsWideStringC(), pElement); content.Clear(); decoder.Clear(); bCDATA = FALSE; @@ -505,7 +506,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, if (!m_bSaveSpaceChars) { dataStr.TrimRight(L" \t\r\n"); } - InsertContentSegment(bCDATA, dataStr, pElement); + InsertContentSegment(bCDATA, dataStr.AsWideStringC(), pElement); content.Clear(); decoder.Clear(); bCDATA = FALSE; -- cgit v1.2.3