Merge to XFA: Kill overloaded cast operators in CJS_Value.

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 124 matching lines @@
         }
 
         return -1;
 }
 
 FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize < 1)
                 return FALSE;
-        std::wstring  c_ConvChar((const wchar_t*)(FX_LPCWSTR)params[0].operator CFX_WideString());
+        std::wstring c_ConvChar(params[0].ToCFXWideString().c_str());
         std::vector<std::wstring> c_strConvers;
         int iOffset = 0;
         int iOffend = 0;
         c_ConvChar.insert(c_ConvChar.begin(),L'S');
         while(iOffset != -1)
         {
                 iOffend = c_ConvChar.find(L"%",iOffset+1);
                 std::wstring strSub;
                 if (iOffend == -1)
                         strSub = c_ConvChar.substr(iOffset);                    
@@ skipping 19 matching lines @@
 
                 CFX_WideString strSegment;
                 if (iIndex >= iSize) {
                         c_strResult += c_strFormat;
                         continue;
                 }
 
                 switch (ParstDataType(&c_strFormat))
                 {
                         case UTIL_INT:
-                                strSegment.Format(c_strFormat.c_str(),(int)params[iIndex]);
+                                strSegment.Format(c_strFormat.c_str(), params[iIndex].ToInt());
                                 break;
                         case UTIL_DOUBLE:
-                                strSegment.Format(c_strFormat.c_str(),(double)params[iIndex]);
+                                strSegment.Format(c_strFormat.c_str(), params[iIndex].ToDouble());
                                 break;
                         case UTIL_STRING:
-                                strSegment.Format(c_strFormat.c_str(),(FX_LPCWSTR)params[iIndex].operator CFX_WideString());
+                                strSegment.Format(c_strFormat.c_str(), params[iIndex].ToCFXWideString().c_str());
                                 break;
                         default:
                                 strSegment.Format(L"%S", c_strFormat.c_str());
                                 break;
                 }
                 c_strResult += strSegment.GetBuffer(strSegment.GetLength()+1);
         }
 
         c_strResult.erase(c_strResult.begin());
         vRet = c_strResult.c_str();
@@ skipping 20 matching lines @@
         }
 
         if (!jsDate.IsValidDate())
         {
                 sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT2);
                 return FALSE;
         }
 
         if (p1.GetType() == VT_number)
         {
-                int nFormat = p1;
-
+                int nFormat = p1.ToInt();
                 CFX_WideString swResult;
 
                 switch (nFormat)
                 {
                 case 0:
                         swResult.Format(L"D:%04d%02d%02d%02d%02d%02d", 
                                 jsDate.GetYear(),
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
@@ skipping 20 matching lines @@
                         break;
                 default:
                         return FALSE;
                 }
 
                 vRet = swResult;
                 return TRUE;
         }
         else if (p1.GetType() == VT_string)
         {
-                std::basic_string<wchar_t> cFormat = (FX_LPCWSTR)p1.operator CFX_WideString();          
+                std::basic_string<wchar_t> cFormat = p1.ToCFXWideString().c_str();
 
                 bool bXFAPicture = false;
                 if (iSize > 2)
                 {
-                        //CJS_Value value;
-                        bXFAPicture = params[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++)
                 {
@@ skipping 169 matching lines @@
         strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
         cFormat = buf;
         cPurpose = cFormat;
 }
 
 FX_BOOL util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize<2)
                 return FALSE;
-        CFX_WideString sFormat = params[0].operator CFX_WideString();
-        CFX_WideString sSource = params[1].operator CFX_WideString();
+        CFX_WideString sFormat = params[0].ToCFXWideString();
+        CFX_WideString sSource = params[1].ToCFXWideString();
         std::string cFormat = CFX_ByteString::FromUnicode(sFormat).c_str();
         std::string cSource = CFX_ByteString::FromUnicode(sSource).c_str();
         std::string cDest;
         printx(cFormat,cSource,cDest);
         vRet = cDest.c_str();
         return TRUE;
 }
 
 void util::printx(const std::string &cFormat,const std::string &cSource2,std::string &cPurpose)
 {
@@ skipping 93 matching lines @@
                 }
         }
 }
 
 FX_BOOL util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
         int iSize = params.size();
         if (iSize < 2)
                 return FALSE;
-        CFX_WideString sFormat = params[0].operator CFX_WideString();
-        CFX_WideString sDate = params[1].operator CFX_WideString();
 
+        CFX_WideString sFormat = params[0].ToCFXWideString();
+        CFX_WideString sDate = params[1].ToCFXWideString();
         double dDate = JS_GetDateTime();
         if (sDate.GetLength() > 0)
         {
                 FX_BOOL bWrongFormat = FALSE;
                 dDate = CJS_PublicMethods::MakeRegularDate(sDate,sFormat,bWrongFormat);
         }       
         
         if (!JS_PortIsNan(dDate))
         {
                 CJS_Date date(isolate,dDate);
@@ skipping 33 matching lines @@
             return -total;
         else
             return total;   /* return result, negated if necessary */
 }
 
 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 = (int)params[0];
+        int nByte = params[0].ToInt();
         unsigned char cByte = (unsigned char)nByte;
         CFX_WideString csValue;
         csValue.Format(L"%c", cByte);
         vRet = csValue; 
         return TRUE;
 }