Add type cast definitions for CPDF_String.

core/src/fpdfdoc/doc_action.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 "../../include/fpdfdoc/fpdf_doc.h"
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
   if (!m_pDict) {
     return CPDF_Dest();
   }
   CFX_ByteString type = m_pDict->GetString("S");
   if (type != "GoTo" && type != "GoToR") {
     return CPDF_Dest();
   }
   CPDF_Object* pDest = m_pDict->GetElementValue("D");
   if (!pDest) {
     return CPDF_Dest();
   }
-  if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
+  if (pDest->IsString() || pDest->GetType() == PDFOBJ_NAME) {
     CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
     CFX_ByteStringC name = pDest->GetString();
     return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
   }
   if (pDest->GetType() == PDFOBJ_ARRAY) {
     return CPDF_Dest((CPDF_Array*)pDest);
   }
   return CPDF_Dest();
 }
 const FX_CHAR* g_sATypes[] = {
@@ skipping 64 matching lines @@
   if (pDict == NULL) {
     return 0;
   }
   CFX_ByteString csType = pDict->GetString("S");
   CPDF_Object* pFields = NULL;
   if (csType == "Hide") {
     pFields = pDict->GetElementValue("T");
   } else {
     pFields = pDict->GetArray("Fields");
   }
-  if (pFields == NULL) {
+  if (!pFields)
     return 0;
-  }
-  int iType = pFields->GetType();
-  if (iType == PDFOBJ_DICTIONARY) {
+  if (pFields->IsDictionary())
     return 1;
-  }
-  if (iType == PDFOBJ_STRING) {
+  if (pFields->IsString())
     return 1;
-  }
-  if (iType == PDFOBJ_ARRAY) {
+  if (pFields->GetType() == PDFOBJ_ARRAY)
     return ((CPDF_Array*)pFields)->GetCount();
-  }
   return 0;
 }
 void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const {
   fieldObjects.RemoveAll();
   if (m_pAction == NULL) {
     return;
   }
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (pDict == NULL) {
     return;
   }
   CFX_ByteString csType = pDict->GetString("S");
   CPDF_Object* pFields = NULL;
   if (csType == "Hide") {
     pFields = pDict->GetElementValue("T");
   } else {
     pFields = pDict->GetArray("Fields");
   }
-  if (pFields == NULL) {
+  if (!pFields)
     return;
-  }
-  int iType = pFields->GetType();
-  if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
+
+  if (pFields->IsDictionary() || pFields->IsString()) {
     fieldObjects.Add(pFields);
-  } else if (iType == PDFOBJ_ARRAY) {
+

[Lei Zhang, 2015/10/21 16:55:56]

no blank line

[dsinclair, 2015/10/21 17:08:05]

Done.

+  } else if (pFields->GetType() == PDFOBJ_ARRAY) {
     CPDF_Array* pArray = (CPDF_Array*)pFields;
     FX_DWORD iCount = pArray->GetCount();
     for (FX_DWORD i = 0; i < iCount; i++) {
       CPDF_Object* pObj = pArray->GetElementValue(i);
       if (pObj != NULL) {
         fieldObjects.Add(pObj);
       }
     }
   }
 }
 CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const {
   if (m_pAction == NULL) {
     return NULL;
   }
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (pDict == NULL) {
     return NULL;
   }
   CFX_ByteString csType = pDict->GetString("S");
   CPDF_Object* pFields = NULL;
   if (csType == "Hide") {
     pFields = pDict->GetElementValue("T");
   } else {
     pFields = pDict->GetArray("Fields");
   }
   if (pFields == NULL) {
     return NULL;
   }
   CPDF_Object* pFindObj = NULL;
-  int iType = pFields->GetType();
-  if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
-    if (iIndex == 0) {
+  if (pFields->IsDictionary() || pFields->IsString()) {
+    if (iIndex == 0)
       pFindObj = pFields;
-    }
-  } else if (iType == PDFOBJ_ARRAY) {
+  } else if (pFields->GetType() == PDFOBJ_ARRAY) {
     pFindObj = ((CPDF_Array*)pFields)->GetElementValue(iIndex);
   }
   return pFindObj;
 }
 
 CFX_WideString CPDF_Action::GetJavaScript() const {
   CFX_WideString csJS;
   if (m_pDict == NULL) {
     return csJS;
   }
@@ skipping 143 matching lines @@
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   return name_tree.GetIndex(csName);
 }