Chromium Code Reviews| Index: fpdfsdk/src/fsdk_baseform.cpp |
| diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp |
| index b4aa822bb69e84683f1854b4628501f7fec66cf4..106e12f971aae94c5382a9416102114a95acb450 100644 |
| --- a/fpdfsdk/src/fsdk_baseform.cpp |
| +++ b/fpdfsdk/src/fsdk_baseform.cpp |
| @@ -2053,10 +2053,9 @@ void CPDFSDK_InterForm::DoFDFBuffer(CFX_ByteString sBuffer) { |
| CPDF_Object* pJS = pJSDict->GetElementValue("Before"); |
| if (pJS != NULL) { |
| - int iType = pJS->GetType(); |
| - if (iType == PDFOBJ_STRING) |
| + if (pJS->IsString()) |
| csJS = pJSDict->GetUnicodeText("Before"); |
| - else if (iType == PDFOBJ_STREAM) |
| + else if (pJS->GetType() == PDFOBJ_STREAM) |
| csJS = pJS->GetUnicodeText(); |
| } |
| } |
| @@ -2226,13 +2225,13 @@ void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects, |
| if (pObject == NULL) |
| continue; |
| - int iType = pObject->GetType(); |
| - if (iType == PDFOBJ_STRING) { |
| + if (pObject->IsString()) { |
| CFX_WideString csName = pObject->GetUnicodeText(); |
| CPDF_FormField* pField = m_pInterForm->GetField(0, csName); |
| if (pField != NULL) |
| fields.Add(pField); |
| - } else if (iType == PDFOBJ_DICTIONARY) { |
| + |
|
Lei Zhang
2015/10/21 16:55:57
no blank line
dsinclair
2015/10/21 17:08:05
Done.
|
| + } else if (pObject->IsDictionary()) { |
| if (m_pInterForm->IsValidFormField(pObject)) |
| fields.Add(pObject); |
| } |