Remove std::string usage in PublicMethods.cpp.

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>
 #include <vector>
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_EventHandler.h"
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/cjs_context.h"
@@ skipping 711 matching lines @@
 
   CFX_WideString& Value = pEvent->Value();
   CFX_ByteString strValue = StrTrim(CFX_ByteString::FromUnicode(Value));
   if (strValue.IsEmpty())
     return TRUE;
 
   int iDec = params[0].ToInt();
   int iSepStyle = params[1].ToInt();
   int iNegStyle = params[2].ToInt();
   // params[3] is iCurrStyle, it's not used.
-  std::wstring wstrCurrency(params[4].ToCFXWideString().c_str());
+  CFX_WideString wstrCurrency = params[4].ToCFXWideString();
   FX_BOOL bCurrencyPrepend = params[5].ToBool();
 
   if (iDec < 0)
     iDec = -iDec;
 
   if (iSepStyle < 0 || iSepStyle > 3)
     iSepStyle = 0;
 
   if (iNegStyle < 0 || iNegStyle > 3)
     iNegStyle = 0;
@@ skipping 52 matching lines @@
       cSeperator = '.';
 
     for (int iDecPositive = iDec2 - 3; iDecPositive > 0; iDecPositive -= 3) {
       strValue.Insert(iDecPositive, cSeperator);
       iMax++;
     }
   }
 
   // for processing currency string
   Value = CFX_WideString::FromLocal(strValue.AsStringC());
-  std::wstring strValue2 = Value.c_str();
 
   if (bCurrencyPrepend)
-    strValue2 = wstrCurrency + strValue2;
+    Value = wstrCurrency + Value;
   else
-    strValue2 = strValue2 + wstrCurrency;
+    Value = Value + wstrCurrency;
 
   // for processing negative style
   if (iNegative) {
     if (iNegStyle == 0) {
-      strValue2.insert(0, L"-");
-    }
-    if (iNegStyle == 2 || iNegStyle == 3) {
-      strValue2.insert(0, L"(");
-      strValue2.insert(strValue2.length(), L")");
+      Value = L"-" + Value;
+    } else if (iNegStyle == 2 || iNegStyle == 3) {
+      Value = L"(" + Value + L")";
     }
     if (iNegStyle == 1 || iNegStyle == 3) {
       if (Field* fTarget = pEvent->Target_Field()) {
         CJS_Array arColor(pRuntime);
         CJS_Value vColElm(pRuntime);
         vColElm = L"RGB";
         arColor.SetElement(0, vColElm);
         vColElm = 1;
         arColor.SetElement(1, vColElm);
         vColElm = 0;
@@ skipping 35 matching lines @@
         if (crColor != crProp) {
           CJS_PropValue vProp2(pRuntime);
           vProp2.StartGetting();
           vProp2 << arColor;
           vProp2.StartSetting();
           fTarget->textColor(cc, vProp2, sError);
         }
       }
     }
   }
-  Value = strValue2.c_str();
 #endif
   return TRUE;
 }
 
 // function AFNumber_Keystroke(nDec, sepStyle, negStyle, currStyle, strCurrency,
 // bCurrencyPrepend)
 FX_BOOL CJS_PublicMethods::AFNumber_Keystroke(
     IJS_Context* cc,
     const std::vector<CJS_Value>& params,
     CJS_Value& vRet,
     CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   CJS_EventHandler* pEvent = pContext->GetEventHandler();
 
   if (params.size() < 2)
     return FALSE;
-  int iSepStyle = params[1].ToInt();
 
-  if (iSepStyle < 0 || iSepStyle > 3)
-    iSepStyle = 0;
   if (!pEvent->m_pValue)
     return FALSE;
+
   CFX_WideString& val = pEvent->Value();
   CFX_WideString& w_strChange = pEvent->Change();
   CFX_WideString w_strValue = val;

[Tom Sepez, 2016/05/03 23:34:30]

nit: can we lose the _ in these local names?

[Lei Zhang, 2016/05/09 19:22:35]

Done.

 
   if (pEvent->WillCommit()) {
     CFX_WideString wstrChange = w_strChange;
     CFX_WideString wstrValue = StrTrim(w_strValue);
     if (wstrValue.IsEmpty())
       return TRUE;
 
     CFX_WideString swTemp = wstrValue;
     swTemp.Replace(L",", L".");
     if (!IsNumber(swTemp.c_str())) {
       pEvent->Rc() = FALSE;
       sError = JSGetStringFromID(pContext, IDS_STRING_JSAFNUMBER_KEYSTROKE);
       Alert(pContext, sError.c_str());
-      return TRUE;
     }
     return TRUE;  // it happens after the last keystroke and before validating,
   }
 
-  std::wstring w_strValue2 = w_strValue.c_str();
-  std::wstring w_strChange2 = w_strChange.c_str();
-  std::wstring w_strSelected;
-  if (-1 != pEvent->SelStart())
-    w_strSelected = w_strValue2.substr(pEvent->SelStart(),
-                                       (pEvent->SelEnd() - pEvent->SelStart()));
-  bool bHasSign = (w_strValue2.find('-') != std::wstring::npos) &&
-                  (w_strSelected.find('-') == std::wstring::npos);
+  CFX_WideString w_strSelected;
+  if (pEvent->SelStart() != -1) {
+    w_strSelected = w_strValue.Mid(pEvent->SelStart(),
+                                   pEvent->SelEnd() - pEvent->SelStart());
+  }
+
+  bool bHasSign = w_strValue.Find(L'-') != -1 && w_strSelected.Find(L'-') == -1;
   if (bHasSign) {
     // can't insert "change" in front to sign postion.
     if (pEvent->SelStart() == 0) {
       FX_BOOL& bRc = pEvent->Rc();
       bRc = FALSE;
       return TRUE;
     }
   }
 
-  char cSep = L'.';
+  int iSepStyle = params[1].ToInt();
+  if (iSepStyle < 0 || iSepStyle > 3)
+    iSepStyle = 0;
+  const FX_WCHAR cSep = iSepStyle < 2 ? L'.' : L',';
 
-  switch (iSepStyle) {
-    case 0:
-    case 1:
-      cSep = L'.';
-      break;
-    case 2:
-    case 3:
-      cSep = L',';
-      break;
-  }
-
-  bool bHasSep = (w_strValue2.find(cSep) != std::wstring::npos);
-  for (std::wstring::iterator it = w_strChange2.begin();
-       it != w_strChange2.end(); it++) {
-    if (*it == cSep) {
+  bool bHasSep = w_strValue.Find(cSep) != -1;
+  for (FX_STRSIZE i = 0; i < w_strChange.GetLength(); ++i) {
+    if (w_strChange[i] == cSep) {
       if (bHasSep) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       bHasSep = TRUE;
       continue;
     }
-    if (*it == L'-') {
+    if (w_strChange[i] == L'-') {
       if (bHasSign) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       // sign's position is not correct
-      if (it != w_strChange2.begin()) {
+      if (i != 0) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       if (pEvent->SelStart() != 0) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       bHasSign = TRUE;
       continue;
     }
 
-    if (!FXSYS_iswdigit(*it)) {
+    if (!FXSYS_iswdigit(w_strChange[i])) {
       FX_BOOL& bRc = pEvent->Rc();
       bRc = FALSE;
       return TRUE;
     }
   }
 
-  std::wstring w_prefix = w_strValue2.substr(0, pEvent->SelStart());
-  std::wstring w_postfix;
-  if (pEvent->SelEnd() < (int)w_strValue2.length())
-    w_postfix = w_strValue2.substr(pEvent->SelEnd());
-  w_strValue2 = w_prefix + w_strChange2 + w_postfix;
-  w_strValue = w_strValue2.c_str();
-  val = w_strValue;
+  CFX_WideString w_prefix = w_strValue.Mid(0, pEvent->SelStart());
+  CFX_WideString w_postfix;
+  if (pEvent->SelEnd() < w_strValue.GetLength())
+    w_postfix = w_strValue.Mid(pEvent->SelEnd());
+  val = w_prefix + w_strChange + w_postfix;
   return TRUE;
 }
 
 // function AFPercent_Format(nDec, sepStyle)
 FX_BOOL CJS_PublicMethods::AFPercent_Format(
     IJS_Context* cc,
     const std::vector<CJS_Value>& params,
     CJS_Value& vRet,
     CFX_WideString& sError) {
 #if _FX_OS_ != _FX_ANDROID_
@@ skipping 417 matching lines @@
   }
 
   if (!pEvent->m_pValue)
     return FALSE;
   CFX_WideString& valEvent = pEvent->Value();
 
   CFX_WideString wstrMask = params[0].ToCFXWideString();
   if (wstrMask.IsEmpty())
     return TRUE;
 
-  const size_t wstrMaskLen = wstrMask.GetLength();
-  const std::wstring wstrValue = valEvent.c_str();
+  if (pEvent->WillCommit()) {
+    if (valEvent.IsEmpty())
+      return TRUE;
 
-  if (pEvent->WillCommit()) {
-    if (wstrValue.empty())
-      return TRUE;
-    size_t iIndexMask = 0;
-    for (const auto& w_Value : wstrValue) {
-      if (!maskSatisfied(w_Value, wstrMask[iIndexMask]))
+    FX_STRSIZE iIndexMask = 0;
+    for (; iIndexMask < valEvent.GetLength(); ++iIndexMask) {
+      if (!maskSatisfied(valEvent[iIndexMask], wstrMask[iIndexMask]))
         break;
-      iIndexMask++;
     }
 
-    if (iIndexMask != wstrMaskLen ||
-        (iIndexMask != wstrValue.size() && wstrMaskLen != 0)) {
+    if (iIndexMask != wstrMask.GetLength() ||
+        (iIndexMask != valEvent.GetLength() && wstrMask.GetLength() != 0)) {
       Alert(
           pContext,
           JSGetStringFromID(pContext, IDS_STRING_JSAFNUMBER_KEYSTROKE).c_str());
       pEvent->Rc() = FALSE;
     }
     return TRUE;
   }
 
   CFX_WideString& wideChange = pEvent->Change();
-  std::wstring wChange = wideChange.c_str();
-  if (wChange.empty())
+  if (wideChange.IsEmpty())
     return TRUE;
 
-  size_t iIndexMask = pEvent->SelStart();
-
-  size_t combined_len = wstrValue.length() + wChange.length() -
-                        (pEvent->SelEnd() - pEvent->SelStart());
-  if (combined_len > wstrMaskLen) {
+  CFX_WideString wChange = wideChange;
+  FX_STRSIZE iIndexMask = pEvent->SelStart();
+  FX_STRSIZE combined_len = valEvent.GetLength() + wChange.GetLength() +
+                            pEvent->SelStart() - pEvent->SelEnd();
+  if (combined_len > wstrMask.GetLength()) {
     Alert(pContext,
           JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
     pEvent->Rc() = FALSE;
     return TRUE;
   }
 
-  if (iIndexMask >= wstrMaskLen && (!wChange.empty())) {
+  if (iIndexMask >= wstrMask.GetLength() && !wChange.IsEmpty()) {
     Alert(pContext,
           JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
     pEvent->Rc() = FALSE;
     return TRUE;
   }
 
-  for (std::wstring::iterator it = wChange.begin(); it != wChange.end(); it++) {
-    if (iIndexMask >= wstrMaskLen) {
+  for (FX_STRSIZE i = 0; i < wChange.GetLength(); ++i) {
+    if (iIndexMask >= wstrMask.GetLength()) {
       Alert(pContext,
             JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
       pEvent->Rc() = FALSE;
       return TRUE;
     }
-    wchar_t w_Mask = wstrMask[iIndexMask];
-    if (!isReservedMaskChar(w_Mask)) {
-      *it = w_Mask;
-    }
-    wchar_t w_Change = *it;
-    if (!maskSatisfied(w_Change, w_Mask)) {
+    FX_WCHAR w_Mask = wstrMask[iIndexMask];
+    if (!isReservedMaskChar(w_Mask))
+      wChange.SetAt(i, w_Mask);
+
+    if (!maskSatisfied(wChange[i], w_Mask)) {
       pEvent->Rc() = FALSE;
       return TRUE;
     }
     iIndexMask++;
   }
-
-  wideChange = wChange.c_str();
+  wideChange = wChange;
   return TRUE;
 }
 
 // function AFSpecial_Keystroke(psf)
 FX_BOOL CJS_PublicMethods::AFSpecial_Keystroke(
     IJS_Context* cc,
     const std::vector<CJS_Value>& params,
     CJS_Value& vRet,
     CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CJS_EventHandler* pEvent = pContext->GetEventHandler();
   if (!pEvent->m_pValue)
     return FALSE;
 
-  std::string cFormat;
-  int iIndex = params[0].ToInt();
-  CFX_WideString& val = pEvent->Value();
-  std::string strSrc = CFX_ByteString::FromUnicode(val).c_str();
-  std::wstring wstrChange = pEvent->Change().c_str();
-
-  switch (iIndex) {
+  const char* cFormat = "";
+  switch (params[0].ToInt()) {
     case 0:
       cFormat = "99999";
       break;
     case 1:
       cFormat = "999999999";
       break;
     case 2:
-      if (strSrc.length() + wstrChange.length() > 7)
+      if (pEvent->Value().GetLength() + pEvent->Change().GetLength() > 7)
         cFormat = "9999999999";
       else
         cFormat = "9999999";
       break;
     case 3:
       cFormat = "999999999";
       break;
   }
 
   std::vector<CJS_Value> params2;
-  params2.push_back(CJS_Value(CJS_Runtime::FromContext(cc), cFormat.c_str()));
+  params2.push_back(CJS_Value(CJS_Runtime::FromContext(cc), cFormat));
   return AFSpecial_KeystrokeEx(cc, params2, vRet, sError);
 }
 
 FX_BOOL CJS_PublicMethods::AFMergeChange(IJS_Context* cc,
                                          const std::vector<CJS_Value>& params,
                                          CJS_Value& vRet,
                                          CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   CJS_EventHandler* pEventHandler = pContext->GetEventHandler();
 
@@ skipping 278 matching lines @@
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }