Add type cast definitions for CPDF_String.

core/src/fpdfdoc/doc_formfield.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"
 #include "doc_utils.h"
 
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) {
@@ skipping 407 matching lines @@
   return pObj->GetInteger();
 }
 int CPDF_FormField::CountSelectedItems() {
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
   if (pValue == NULL) {
     pValue = FPDF_GetFieldAttr(m_pDict, "I");
     if (pValue == NULL) {
       return 0;
     }
   }
-  if (pValue->GetType() == PDFOBJ_STRING) {
-    if (pValue->GetString().IsEmpty()) {
-      return 0;
-    }
-    return 1;
-  }
-  if (pValue->IsNumber()) {
-    if (pValue->GetString().IsEmpty()) {
-      return 0;
-    }
-    return 1;
-  }
+
+  if (pValue->IsString() || pValue->IsNumber())
+    return !pValue->GetString().IsEmpty();

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

This should still return 0 or 1, rather than true/false.

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

Done.

+
   if (pValue->GetType() != PDFOBJ_ARRAY) {
     return 0;
   }
   return ((CPDF_Array*)pValue)->GetCount();
 }
 int CPDF_FormField::GetSelectedIndex(int index) {
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
   if (pValue == NULL) {
     pValue = FPDF_GetFieldAttr(m_pDict, "I");
     if (pValue == NULL) {
       return -1;
     }
   }
   if (pValue->IsNumber())
     return pValue->GetInteger();
 
   CFX_WideString sel_value;
-  if (pValue->GetType() == PDFOBJ_STRING) {
-    if (index != 0) {
+  if (pValue->IsString()) {
+    if (index != 0)
       return -1;
-    }
+
     sel_value = pValue->GetUnicodeText();
   } else {
     if (pValue->GetType() != PDFOBJ_ARRAY) {
       return -1;
     }
     if (index < 0) {
       return -1;
     }
     CPDF_Object* elementValue = ((CPDF_Array*)pValue)->GetElementValue(index);
     sel_value =
@@ skipping 57 matching lines @@
     return TRUE;
   }
   CFX_WideString opt_value = GetOptionValue(index);
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
   if (pValue == NULL) {
     pValue = FPDF_GetFieldAttr(m_pDict, "I");
     if (pValue == NULL) {
       return FALSE;
     }
   }
-  if (pValue->GetType() == PDFOBJ_STRING) {
-    if (pValue->GetUnicodeText() == opt_value) {
+
+  if (pValue->IsString())
+    return (pValue->GetUnicodeText() == opt_value);

[Tom Sepez, 2015/10/21 17:12:50]

nit: overparenthesized.

[dsinclair, 2015/10/21 17:40:01]

Done.

+
+  if (pValue->IsNumber()) {
+    if (pValue->GetString().IsEmpty())
+      return FALSE;
+    if (pValue->GetInteger() == index)

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

just return pValue->GetInteger() == index;

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

Done.

       return TRUE;
-    }
     return FALSE;
   }
-  if (pValue->IsNumber()) {
-    if (pValue->GetString().IsEmpty()) {
-      return FALSE;
-    }
-    if (pValue->GetInteger() == index) {
-      return TRUE;
-    }
-    return FALSE;
-  }
+
   if (pValue->GetType() != PDFOBJ_ARRAY) {
     return FALSE;
   }
   CPDF_Array* pArray = (CPDF_Array*)pValue;
   int iPos = -1;
   for (int j = 0; j < CountSelectedOptions(); j++) {
     if (GetSelectedOptionIndex(j) == index) {
       iPos = j;
       break;
     }
@@ skipping 23 matching lines @@
     }
     if (iRet < 0) {
       return FALSE;
     }
   }
   if (!bSelected) {
     CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
     if (pValue != NULL) {
       if (m_Type == ListBox) {
         SelectOption(index, FALSE);
-        if (pValue->GetType() == PDFOBJ_STRING) {
+        if (pValue->IsString()) {
           if (pValue->GetUnicodeText() == opt_value) {
             m_pDict->RemoveAt("V");
           }
         } else if (pValue->GetType() == PDFOBJ_ARRAY) {
           CPDF_Array* pArray = CPDF_Array::Create();
           if (pArray == NULL) {
             return FALSE;
           }
           int iCount = CountOptions();
           for (int i = 0; i < iCount; i++) {
@@ skipping 120 matching lines @@
   if (pValue == NULL || pValue->GetType() != PDFOBJ_ARRAY) {
     return CFX_WideString();
   }
   CPDF_Object* pOption = ((CPDF_Array*)pValue)->GetElementValue(index);
   if (pOption == NULL) {
     return CFX_WideString();
   }
   if (pOption->GetType() == PDFOBJ_ARRAY) {
     pOption = ((CPDF_Array*)pOption)->GetElementValue(sub_index);
   }
-  if (pOption == NULL || pOption->GetType() != PDFOBJ_STRING) {
-    return CFX_WideString();
-  }
-  return ((CPDF_String*)pOption)->GetUnicodeText();
+
+  CPDF_String* pString = ToString(pOption);
+  return pString ? pString->GetUnicodeText() : CFX_WideString();
 }
 CFX_WideString CPDF_FormField::GetOptionLabel(int index) {
   return GetOptionText(index, 1);
 }
 CFX_WideString CPDF_FormField::GetOptionValue(int index) {
   return GetOptionText(index, 0);
 }
 int CPDF_FormField::FindOption(CFX_WideString csOptLabel) {
   int iCount = CountOptions();
   for (int i = 0; i < iCount; i++) {
@@ skipping 314 matching lines @@
       m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font"))
     pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(
         font_name);
 
   if (pFontDict == NULL) {
     return;
   }
   m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
   m_FontSize = FX_atof(syntax.GetWord());
 }