Add type cast definitions for CPDF_String.

fpdfsdk/src/fsdk_baseform.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 2035 matching lines @@
     CPDF_Dictionary* pRootDic = pFDFDocument->GetRoot();
     if (pRootDic) {
       CPDF_Dictionary* pFDFDict = pRootDic->GetDict("FDF");
       if (pFDFDict) {
         CPDF_Dictionary* pJSDict = pFDFDict->GetDict("JavaScript");
         if (pJSDict) {
           CFX_WideString csJS;
 
           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();
           }
         }
       }
     }
     delete pFDFDocument;
   }
 
   sBuffer.ReleaseBuffer();
 }
@@ skipping 149 matching lines @@
 void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects,
                                             CFX_PtrArray& fields) {
   ASSERT(m_pInterForm != NULL);
 
   int iCount = objects.GetSize();
   for (int i = 0; i < iCount; i++) {
     CPDF_Object* pObject = (CPDF_Object*)objects[i];
     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);
     }
   }
 }
 
 /* ----------------------------- CPDF_FormNotify -----------------------------
  */
 
 int CPDFSDK_InterForm::BeforeValueChange(const CPDF_FormField* pField,
@@ skipping 393 matching lines @@
   ASSERT(pAnnot != NULL);
 
   CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
   ASSERT(pPDFAnnot != NULL);
 
   CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
   return rcAnnot;
 }