Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.

xfa/fxfa/parser/xfa_document_serialize.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/parser/xfa_document_serialize.h"
 
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
@@ skipping 242 matching lines @@
           break;
         }
         IFX_MemoryStream* pMemStream = FX_CreateMemoryStream(TRUE);
         IFX_Stream* pTempStream = IFX_Stream::CreateStream(
             (IFX_FileWrite*)pMemStream, FX_STREAMACCESS_Text |
                                             FX_STREAMACCESS_Write |
                                             FX_STREAMACCESS_Append);
         pTempStream->SetCodePage(FX_CODEPAGE_UTF8);
         pRichTextXML->SaveXMLNode(pTempStream);
         wsChildren += CFX_WideString::FromUTF8(
-            (const FX_CHAR*)pMemStream->GetBuffer(), pMemStream->GetSize());
+            CFX_ByteStringC(pMemStream->GetBuffer(), pMemStream->GetSize()));
         pTempStream->Release();
         pMemStream->Release();
       } else if (pRawValueNode->GetClassID() == XFA_ELEMENT_Sharpxml &&
                  wsContentType == FX_WSTRC(L"text/xml")) {
         CFX_WideString wsRawValue;
         pRawValueNode->GetAttribute(XFA_ATTRIBUTE_Value, wsRawValue, FALSE);
         if (wsRawValue.IsEmpty()) {
           break;
         }
         CFX_WideStringArray wsSelTextArray;
@@ skipping 153 matching lines @@
 void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
                                          IFX_Stream* pStream,
                                          const FX_CHAR* pChecksum,
                                          FX_BOOL bSaveXML) {
   if (pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) {
     static const FX_WCHAR* s_pwsTagName = L"<form";
     static const FX_WCHAR* s_pwsClose = L"</form\n>";
     pStream->WriteString(s_pwsTagName, FXSYS_wcslen(s_pwsTagName));
     if (pChecksum) {
       static const FX_WCHAR* s_pwChecksum = L" checksum=\"";
-      CFX_WideString wsChecksum =
-          CFX_WideString::FromUTF8(pChecksum, FXSYS_strlen(pChecksum));
+      CFX_WideString wsChecksum = CFX_WideString::FromUTF8(pChecksum);
       pStream->WriteString(s_pwChecksum, FXSYS_wcslen(s_pwChecksum));
       pStream->WriteString((const FX_WCHAR*)wsChecksum, wsChecksum.GetLength());
       pStream->WriteString(L"\"", 1);
     }
     pStream->WriteString(L" xmlns=\"", FXSYS_wcslen(L" xmlns=\""));
     const FX_WCHAR* pURI = XFA_GetPacketByIndex(XFA_PACKET_Form)->pURI;
     pStream->WriteString(pURI, FXSYS_wcslen(pURI));
     CFX_WideString wsVersionNumber;
     XFA_DataExporter_RecognizeXFAVersionNumber(
         ToNode(pNode->GetDocument()->GetXFAObject(XFA_XDPPACKET_Template)),
@@ skipping 128 matching lines @@
         pXMLElement->RemoveAttribute(L"xfa:dataNode");
       }
     } else {
       CFDE_XMLNode* pXMLNode = pDataNode->GetXMLMappingNode();
       FXSYS_assert(pXMLNode->GetType() == FDE_XMLNODE_Element);
       static_cast<CFDE_XMLElement*>(pXMLNode)
           ->SetString(FX_WSTRC(L"xfa:dataNode"), FX_WSTRC(L"dataGroup"));
     }
   }
 }