diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-14 17:35:04 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-14 17:35:04 -0800 |
| commit | 283ef3c9292889ef7d53e9e451f9272d4efb0221 (patch) | |
| tree | 98a868a584f13538e24a12e070c55d659086c48b /fpdfsdk/src/javascript/Field.cpp | |
| parent | 4cd5b80e70e5fc50d8bd805cfa3c7b54878a0a35 (diff) | |
| download | pdfium-283ef3c9292889ef7d53e9e451f9272d4efb0221.tar.xz | |
Revert "Cleanup CJS_PublicMethods::ParseNumber"
This reverts commit 4cd5b80e70e5fc50d8bd805cfa3c7b54878a0a35.
Reason for revert: broke tests on windows
TBR=tombergan@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1573243016 .
Diffstat (limited to 'fpdfsdk/src/javascript/Field.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Field.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index ebd3d331f5..959e8dcadd 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -2741,8 +2741,13 @@ FX_BOOL Field::value(IJS_Context* cc, CFX_WideString swValue = pFormField->GetValue(); double dRet; - if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) { - vp << dRet; + FX_BOOL bDot; + if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet, + bDot)) { + if (bDot) + vp << dRet; + else + vp << dRet; } else { vp << swValue; } @@ -2764,8 +2769,13 @@ FX_BOOL Field::value(IJS_Context* cc, CFX_WideString swValue = pFormField->GetValue(); double dRet; - if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) { - vp << dRet; + FX_BOOL bDot; + if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet, + bDot)) { + if (bDot) + vp << dRet; + else + vp << dRet; } else { vp << swValue; } @@ -2780,7 +2790,9 @@ FX_BOOL Field::value(IJS_Context* cc, CFX_WideString swValue = pFormField->GetControl(i)->GetExportValue(); double dRet; - if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet)) { + FX_BOOL bDotDummy; + if (CJS_PublicMethods::ConvertStringToNumber(swValue.c_str(), dRet, + bDotDummy)) { vp << dRet; } else { vp << swValue; |