Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: fpdfsdk/javascript/PublicMethods.cpp

Issue 1837543002: Added test for util.printx() and make it match spec. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Cross-contamination with other CL Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | fpdfsdk/javascript/util.h » ('j') | fpdfsdk/javascript/util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/javascript/PublicMethods.cpp
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index b85111bed7db65c5d0430a362dc0894e8a5ab243..6f9f514bd08826f460ae55766a947f79b8a176aa 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -1440,23 +1440,18 @@ FX_BOOL CJS_PublicMethods::AFSpecial_Format(
case 1:
cFormat = "99999-9999";
break;
- case 2: {
- std::string NumberStr;
- util::printx("9999999999", strSrc, NumberStr);
- if (NumberStr.length() >= 10)
+ case 2:
+ if (util::printx("9999999999", strSrc).length() >= 10)
cFormat = "(999) 999-9999";
else
cFormat = "999-9999";
break;
- }
case 3:
cFormat = "999-99-9999";
break;
}
- std::string strDes;
- util::printx(cFormat, strSrc, strDes);
- Value = CFX_WideString::FromLocal(strDes.c_str());
+ Value = CFX_WideString::FromLocal(util::printx(cFormat, strSrc).c_str());
return TRUE;
}
@@ -1578,22 +1573,15 @@ FX_BOOL CJS_PublicMethods::AFSpecial_Keystroke(
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;
}
« no previous file with comments | « no previous file | fpdfsdk/javascript/util.h » ('j') | fpdfsdk/javascript/util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698