[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

core/src/fpdftext/fpdf_text_int.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 <ctype.h>
 #include <algorithm>
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
@@ skipping 1321 matching lines @@
   if (nContentMark < 1) {
     return FPDFTEXT_MC_PASS;
   }
   CFX_WideString actText;
   FX_BOOL bExist = FALSE;
   CPDF_Dictionary* pDict = NULL;
   int n = 0;
   for (n = 0; n < nContentMark; n++) {
     CPDF_ContentMarkItem& item = pMarkData->GetItem(n);
     CFX_ByteString tagStr = (CFX_ByteString)item.GetName();
-    pDict = (CPDF_Dictionary*)item.GetParam();
+    pDict = ToDictionary(static_cast<CPDF_Object*>(item.GetParam()));
     CPDF_String* temp =
         (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText"))
                              : NULL);
     if (temp) {
       bExist = TRUE;
       actText = temp->GetUnicodeText();
     }
   }
   if (!bExist) {
     return FPDFTEXT_MC_PASS;
@@ skipping 50 matching lines @@
   int nContentMark = pMarkData->CountItems();
   if (nContentMark < 1) {
     return;
   }
   CFX_WideString actText;
   CPDF_Dictionary* pDict = NULL;
   int n = 0;
   for (n = 0; n < nContentMark; n++) {
     CPDF_ContentMarkItem& item = pMarkData->GetItem(n);
     CFX_ByteString tagStr = (CFX_ByteString)item.GetName();
-    pDict = (CPDF_Dictionary*)item.GetParam();
-    CPDF_String* temp = (CPDF_String*)pDict->GetElement(FX_BSTRC("ActualText"));
+
+    pDict = ToDictionary(static_cast<CPDF_Object*>(item.GetParam()));
+    CPDF_String* temp =
+        (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText"))

[dsinclair, 2015/10/20 19:18:31]

On XFA the ternary is missing and it was just:

(CPDF_String*)pDict->GetElement(FX_BSTRC("ActualText"));

I merged the null check in from master.

[Tom Sepez, 2015/10/20 19:49:28]

Acknowledged.

+                             : NULL);
+
     if (temp) {
       actText = temp->GetUnicodeText();
     }
   }
   FX_STRSIZE nItems = actText.GetLength();
   if (nItems < 1) {
     return;
   }
   CPDF_Font* pFont = pTextObj->GetFont();
   CFX_AffineMatrix formMatrix = Obj.m_formMatrix;
@@ skipping 1343 matching lines @@
   if (!m_IsParserd || index < 0 || index >= m_LinkList.GetSize()) {
     return;
   }
   CPDF_LinkExt* link = NULL;
   link = m_LinkList.GetAt(index);
   if (!link) {
     return;
   }
   m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }