diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:29:23 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:29:23 -0400 |
| commit | 316eb864137a0b8eeb0d0d4d698ba83f4946a89c (patch) | |
| tree | 9268f9369d9382ca3ee8f7496ab71394dfa9daef /fpdfsdk/src/javascript/Document.cpp | |
| parent | 43ce9035a026c7b4f15aa938dc39444d9253ea9f (diff) | |
| download | pdfium-316eb864137a0b8eeb0d0d4d698ba83f4946a89c.tar.xz | |
Merge to XFA: Add type cast definitions for CPDF_String.
This Cl adds ToString, CPDF_Object::AsString and CPDF_Object::IsString and
updates the src to use them as needed.
BUG=pdfium:201
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1417933002 .
(cherry picked from commit 53d3ab125ef583be8cfac907b308a6551b93067a)
Review URL: https://codereview.chromium.org/1408323006 .
Diffstat (limited to 'fpdfsdk/src/javascript/Document.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 939b74e9db..f69a39816f 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -850,14 +850,16 @@ FX_BOOL Document::info(IJS_Context* cc, CFX_ByteString bsKey; CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey); CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength()); - if ((pValueObj->GetType() == PDFOBJ_STRING) || - (pValueObj->GetType() == PDFOBJ_NAME)) + if (pValueObj->IsString() || (pValueObj->GetType() == PDFOBJ_NAME)) { FXJS_PutObjectString(isolate, pObj, wsKey.c_str(), pValueObj->GetUnicodeText().c_str()); + } + if (pValueObj->IsNumber()) { FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(), (float)pValueObj->GetNumber()); } + if (pValueObj->IsBoolean()) { FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(), (bool)pValueObj->GetInteger()); |