commit 4f1f41f338ce0899e48605c82375a72883f4eb7c
author tsepez <tsepez@chromium.org> Mon Mar 28 14:13:16 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Mar 28 14:13:16 2016 -0700
tree a89cc3f1d8b981fa12d7fd423ef6883c7a502798
parent 4678e283c5b48a8954bd0db3565b1376bd9c6b27

Added test for util.printx() and make it match spec.

R=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1837543002

fpdfsdk/javascript/PublicMethods.cpp

diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index b85111b..a4c1356 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -1424,39 +1424,31 @@
     return FALSE;
   }
 
-  std::string cFormat;
-  int iIndex = params[0].ToInt();
-
   CJS_EventHandler* pEvent = pContext->GetEventHandler();
   if (!pEvent->m_pValue)
     return FALSE;
-  CFX_WideString& Value = pEvent->Value();
-  std::string strSrc = CFX_ByteString::FromUnicode(Value).c_str();
 
-  switch (iIndex) {
+  CFX_WideString wsSource = pEvent->Value();
+  CFX_WideString wsFormat;
+  switch (params[0].ToInt()) {
     case 0:
-      cFormat = "99999";
+      wsFormat = L"99999";
       break;
     case 1:
-      cFormat = "99999-9999";
+      wsFormat = L"99999-9999";
       break;
-    case 2: {
-      std::string NumberStr;
-      util::printx("9999999999", strSrc, NumberStr);
-      if (NumberStr.length() >= 10)
-        cFormat = "(999) 999-9999";
+    case 2:
+      if (util::printx(L"9999999999", wsSource).GetLength() >= 10)
+        wsFormat = L"(999) 999-9999";
       else
-        cFormat = "999-9999";
+        wsFormat = L"999-9999";
       break;
-    }
     case 3:
-      cFormat = "999-99-9999";
+      wsFormat = L"999-99-9999";
       break;
   }
 
-  std::string strDes;
-  util::printx(cFormat, strSrc, strDes);
-  Value = CFX_WideString::FromLocal(strDes.c_str());
+  pEvent->Value() = util::printx(wsFormat, wsSource);
   return TRUE;
 }
 
@@ -1578,22 +1570,15 @@
       cFormat = "99999";
       break;
     case 1:
-      // cFormat = "99999-9999";
       cFormat = "999999999";
       break;
-    case 2: {
-      std::string NumberStr;
-      util::printx("9999999999", strSrc, NumberStr);
+    case 2:
       if (strSrc.length() + wstrChange.length() > 7)
-        // cFormat = "(999) 999-9999";
         cFormat = "9999999999";
       else
-        // cFormat = "999-9999";
         cFormat = "9999999";
       break;
-    }
     case 3:
-      // cFormat = "999-99-9999";
       cFormat = "999999999";
       break;
   }