| Index: core/fxcrt/fx_xml_parser.cpp
 | 
| diff --git a/core/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp
 | 
| index 4b521891421e225672c3037aef7c03135953cfa9..a5e351fe56068f1f2cf7afc097a7f99835da8b58 100644
 | 
| --- a/core/fxcrt/fx_xml_parser.cpp
 | 
| +++ b/core/fxcrt/fx_xml_parser.cpp
 | 
| @@ -457,7 +457,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent,
 | 
|              iState = 10;
 | 
|            } else {
 | 
|              content << decoder.GetResult();
 | 
| -            CFX_WideString dataStr = content.AsStringC();
 | 
| +            CFX_WideString dataStr = content.MakeString();
 | 
|              if (!bCDATA && !m_bSaveSpaceChars) {
 | 
|                dataStr.TrimRight(L" \t\r\n");
 | 
|              }
 | 
| @@ -501,7 +501,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent,
 | 
|      }
 | 
|    } while (ReadNextBlock());
 | 
|    content << decoder.GetResult();
 | 
| -  CFX_WideString dataStr = content.AsStringC();
 | 
| +  CFX_WideString dataStr = content.MakeString();
 | 
|    if (!m_bSaveSpaceChars) {
 | 
|      dataStr.TrimRight(L" \t\r\n");
 | 
|    }
 | 
| @@ -784,7 +784,7 @@ void CXML_AttrMap::SetAt(const CFX_ByteStringC& space,
 | 
|      }
 | 
|    }
 | 
|  
 | 
| -  m_pMap->push_back({space, name, value});
 | 
| +  m_pMap->push_back({space, name, CFX_WideString(value)});
 | 
|  }
 | 
|  
 | 
|  int CXML_AttrMap::GetSize() const {
 | 
| 
 |