Pass WideStrings without narrowing to c_str in javascript/

fpdfsdk/javascript/PublicMethods.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 "fpdfsdk/javascript/PublicMethods.h"
 
 #include <algorithm>
 #include <string>
@@ skipping 288 matching lines @@
     if (bWrongFormat)
       *bWrongFormat = false;
   } else {
     if (bWrongFormat)
       *bWrongFormat = true;
     return dt;
   }
 
   CFX_WideString swTemp;
   swTemp.Format(L"%d/%d/%d %d:%d:%d", nMonth, nDay, nYear, nHour, nMin, nSec);
-  return JS_DateParse(swTemp.c_str());
+  return JS_DateParse(swTemp);
 }
 
 double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value,
                                           const CFX_WideString& format,
                                           bool* bWrongFormat) {
   double dt = JS_GetDateTime();
 
   if (format.IsEmpty() || value.IsEmpty())
     return dt;
 
@@ skipping 236 matching lines @@
   if (nHour < 0 || nHour > 24)
     bBadFormat = true;
 
   if (nMin < 0 || nMin > 60)
     bBadFormat = true;
 
   if (nSec < 0 || nSec > 60)
     bBadFormat = true;
 
   double dRet = 0;
-
   if (bBadFormat) {
     dRet = ParseNormalDate(value, &bBadFormat);
   } else {
     dRet = JS_MakeDate(JS_MakeDay(nYear, nMonth - 1, nDay),
                        JS_MakeTime(nHour, nMin, nSec, 0));
-
-    if (JS_PortIsNan(dRet)) {
-      dRet = JS_DateParse(value.c_str());
-    }
+    if (JS_PortIsNan(dRet))
+      dRet = JS_DateParse(value);
   }
 
-  if (JS_PortIsNan(dRet)) {
+  if (JS_PortIsNan(dRet))
     dRet = ParseNormalDate(value, &bBadFormat);
-  }
 
   if (bWrongFormat)
     *bWrongFormat = bBadFormat;
+
   return dRet;
 }
 
 CFX_WideString CJS_PublicMethods::MakeFormatDate(double dDate,
                                                  const CFX_WideString& format) {
   CFX_WideString sRet = L"", sPart = L"";
 
   int nYear = JS_GetYearFromTime(dDate);
   int nMonth = JS_GetMonthFromTime(dDate) + 1;
   int nDay = JS_GetDayFromTime(dDate);
@@ skipping 603 matching lines @@
     nMonth = 12;
 
   int nDay = FX_atof(wsArray[2].AsStringC());
   int nHour = FX_atof(wsArray[3].AsStringC());
   int nMin = FX_atof(wsArray[4].AsStringC());
   int nSec = FX_atof(wsArray[5].AsStringC());
   int nYear = FX_atof(wsArray[7].AsStringC());
   double dRet = JS_MakeDate(JS_MakeDay(nYear, nMonth - 1, nDay),
                             JS_MakeTime(nHour, nMin, nSec, 0));
   if (JS_PortIsNan(dRet))
-    dRet = JS_DateParse(strValue.c_str());
+    dRet = JS_DateParse(strValue);
 
   return dRet;
 }
 
 // AFDate_KeystrokeEx(cFormat)
 FX_BOOL CJS_PublicMethods::AFDate_KeystrokeEx(
     IJS_Context* cc,
     const std::vector<CJS_Value>& params,
     CJS_Value& vRet,
     CFX_WideString& sError) {
@@ skipping 627 matching lines @@
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }