Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString().

fpdfsdk/src/javascript/util.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 247 matching lines @@
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 default:
                         return FALSE;
                 }
 
-                vRet = swResult;
+                vRet = swResult.c_str();
                 return TRUE;
         }
         else if (p1.GetType() == VT_string)
         {
                 std::basic_string<wchar_t> cFormat = p1.ToCFXWideString().c_str();
 
                 bool bXFAPicture = false;
                 if (iSize > 2)
                 {
                         bXFAPicture = params[2].ToBool();
                 }
 
                 if (bXFAPicture)
                 {
                         return FALSE; //currently, it doesn't support XFAPicture.
                 }
 
         int iIndex;
                 for(iIndex = 0;iIndex<sizeof(fcTable)/sizeof(stru_TbConvert);iIndex++)
                 {
                         int iStart = 0;
                         int iEnd;
-                        while((iEnd = cFormat.find((CFX_WideString)fcTable[iIndex].lpszJSMark, iStart)) != -1)
+                        while((iEnd = cFormat.find(fcTable[iIndex].lpszJSMark, iStart)) != -1)
                         {
-                                cFormat.replace(iEnd, FXSYS_wcslen(fcTable[iIndex].lpszJSMark), (CFX_WideString)fcTable[iIndex].lpszCppMark);
+                                cFormat.replace(iEnd, FXSYS_wcslen(fcTable[iIndex].lpszJSMark), fcTable[iIndex].lpszCppMark);
                                 iStart = iEnd;
                         }
                 }
 
                 int iYear,iMonth,iDay,iHour,iMin,iSec;
                 iYear = jsDate.GetYear();
                 iMonth = jsDate.GetMonth();
                 iDay = jsDate.GetDay();
                 iHour = jsDate.GetHours();
                 iMin = jsDate.GetMinutes();
@@ skipping 31 matching lines @@
                         //_itot(cTableAd[iIndex].iValue,tszValue,10);
                         CFX_WideString sValue;
                         sValue.Format(L"%d",cTableAd[iIndex].iValue);
                         memcpy(tszValue, (wchar_t *)sValue.GetBuffer(sValue.GetLength()+1),
                                (sValue.GetLength()+1)*sizeof(wchar_t));
 
                         //strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
                         //strFormat.Format(strFormat,cTableAd[iIndex].iValue);
                         int iStart = 0;
                         int iEnd;
-                        while((iEnd = cFormat.find((CFX_WideString)cTableAd[iIndex].lpszJSMark,iStart)) != -1)
+                        while((iEnd = cFormat.find(cTableAd[iIndex].lpszJSMark, iStart)) != -1)
                         {
                                 if (iEnd > 0)
                                 {
                                         if (cFormat[iEnd-1] == L'%')
                                         {
                                                 iStart = iEnd+1;
                                                 continue;
                                         }
                                 }
                                 cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[iIndex].lpszJSMark), tszValue);
@@ skipping 21 matching lines @@
         if (bXFAPicture)
         {
                 return ; //currently, it doesn't support XFAPicture.
         }
 
     int iIndex;
         for(iIndex = 0;iIndex<sizeof(fcTable)/sizeof(stru_TbConvert);iIndex++)
         {
                 int iStart = 0;
                 int iEnd;
-                while((iEnd = cFormat.find((CFX_WideString)fcTable[iIndex].lpszJSMark,iStart)) != -1)
+                while((iEnd = cFormat.find(fcTable[iIndex].lpszJSMark, iStart)) != -1)
                 {
-                        cFormat.replace(iEnd,FXSYS_wcslen(fcTable[iIndex].lpszJSMark), (CFX_WideString)fcTable[iIndex].lpszCppMark);
+                        cFormat.replace(iEnd,FXSYS_wcslen(fcTable[iIndex].lpszJSMark), fcTable[iIndex].lpszCppMark);
                         iStart = iEnd;
                 }
         }
 
         int iYear,iMonth,iDay,iHour,iMin,iSec;
         iYear = jsDate.GetYear();
         iMonth = jsDate.GetMonth();
         iDay = jsDate.GetDay();
         iHour = jsDate.GetHours();
         iMin = jsDate.GetMinutes();
@@ skipping 31 matching lines @@
                 //_itot(cTableAd[iIndex].iValue,tszValue,10);
                 CFX_WideString sValue;
                 sValue.Format(L"%d",cTableAd[iIndex].iValue);
                 memcpy(tszValue, (wchar_t *)sValue.GetBuffer(sValue.GetLength()+1),sValue.GetLength()*sizeof(wchar_t));
 
 
                 //strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
                 //strFormat.Format(strFormat,cTableAd[iIndex].iValue);
                 int iStart = 0;
                 int iEnd;
-                while((iEnd = cFormat.find((CFX_WideString)cTableAd[iIndex].lpszJSMark,iStart)) != -1)
+                while((iEnd = cFormat.find(cTableAd[iIndex].lpszJSMark, iStart)) != -1)
                 {
                         if (iEnd > 0)
                         {
                                 if (cFormat[iEnd-1] == L'%')
                                 {
                                         iStart = iEnd+1;
                                         continue;
                                 }
                         }
                         cFormat.replace(iEnd,FXSYS_wcslen(cTableAd[iIndex].lpszJSMark),tszValue);
@@ skipping 181 matching lines @@
 
 FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize == 0)
                 return FALSE;
         int nByte = params[0].ToInt();
         unsigned char cByte = (unsigned char)nByte;
         CFX_WideString csValue;
         csValue.Format(L"%c", cByte);
-        vRet = csValue; 
+        vRet = csValue.c_str();
         return TRUE;
 }