Merge to XFA: Add type cast definitions for CPDF_Name.

fpdfsdk/src/fpdfppo.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 "../../public/fpdf_ppo.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 
@@ skipping 168 matching lines @@
   return TRUE;
 }
 
 CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
     CPDF_Dictionary* pDict,
     CFX_ByteString nSrctag) {
   if (!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
     return NULL;
 
   CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
-  if (!pType || pType->GetType() != PDFOBJ_NAME)
-    return NULL;
-
+  if (!ToName(pType))
+    return nullptr;

[dsinclair, 2015/10/21 18:00:14]

Merge conflict. I'm guessing due to the NULL vs nullptr? Seems like XFA differs
slightly here.

[Tom Sepez, 2015/10/21 19:41:04]

Acknowledged.

   if (pType->GetString().Compare("Page"))
     return NULL;
   if (!pDict->KeyExist("Parent"))
     return NULL;
 
   CPDF_Dictionary* pp = ToDictionary(pDict->GetElement("Parent")->GetDirect());
   if (!pp)
     return nullptr;
 
   if (pDict->KeyExist((const char*)nSrctag))
@@ skipping 211 matching lines @@
   if (!pSrcDict)
     return FALSE;
 
   CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
   if (!pDstDict)
     return FALSE;
 
   pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
   return TRUE;
 }