| Index: fpdfsdk/src/javascript/Field.cpp
|
| diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
|
| index a0570cb56c61d954080297b1263a226a880c0aab..66a9601cbf27dca62e31a706c8e11c5d2848b494 100644
|
| --- a/fpdfsdk/src/javascript/Field.cpp
|
| +++ b/fpdfsdk/src/javascript/Field.cpp
|
| @@ -1038,7 +1038,7 @@ FX_BOOL Field::currentValueIndices(IFXJS_Context* cc,
|
|
|
| CFX_DWordArray array;
|
|
|
| - if (vp.GetType() == VT_number) {
|
| + if (vp.GetType() == CJS_Value::VT_number) {
|
| int iSelecting = 0;
|
| vp >> iSelecting;
|
| array.Add(iSelecting);
|
| @@ -3316,15 +3316,12 @@ FX_BOOL Field::buttonGetIcon(IFXJS_Context* cc,
|
| ASSERT(pRuntime != NULL);
|
|
|
| v8::Local<v8::Object> pObj =
|
| - JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
|
| - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon"));
|
| + FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
|
| + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon"));
|
| ASSERT(pObj.IsEmpty() == FALSE);
|
|
|
| - CJS_Icon* pJS_Icon = (CJS_Icon*)JS_GetPrivate(pObj);
|
| - ASSERT(pJS_Icon != NULL);
|
| -
|
| + CJS_Icon* pJS_Icon = (CJS_Icon*)FXJS_GetPrivate(pObj);
|
| Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
|
| - ASSERT(pIcon != NULL);
|
|
|
| CPDF_Stream* pIconStream = NULL;
|
| if (nface == 0)
|
| @@ -3531,17 +3528,13 @@ FX_BOOL Field::getArray(IFXJS_Context* cc,
|
| for (int j = 0, jsz = swSort.GetSize(); j < jsz; j++) {
|
| CFX_WideString* pStr = swSort.GetAt(j);
|
|
|
| - v8::Local<v8::Object> pObj =
|
| - JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
|
| - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field"));
|
| + v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
|
| + pRuntime->GetIsolate(), pContext,
|
| + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field"));
|
| ASSERT(pObj.IsEmpty() == FALSE);
|
|
|
| - CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(pObj);
|
| - ASSERT(pJSField != NULL);
|
| -
|
| + CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(pObj);
|
| Field* pField = (Field*)pJSField->GetEmbedObject();
|
| - ASSERT(pField != NULL);
|
| -
|
| pField->AttachField(m_pJSDoc, *pStr);
|
|
|
| CJS_Value FormFieldValue(m_isolate);
|
|
|