Merge to XFA: Revert "Revert "Add type cast definitions for CPDF_Reference.""

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 198 matching lines @@
     pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
   }
   return nullptr;
 }
 
 FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
                                             CPDF_Document* pDoc,
                                             CFX_MapPtrToPtr* pMapPtrToPtr) {
   switch (pObj->GetType()) {
     case PDFOBJ_REFERENCE: {
-      CPDF_Reference* pReference = (CPDF_Reference*)pObj;
+      CPDF_Reference* pReference = pObj->AsReference();
       int newobjnum = GetNewObjId(pDoc, pMapPtrToPtr, pReference);

[dsinclair, 2015/10/26 20:13:54]

There was a merge conflict here because line 220 had changed.

       if (newobjnum == 0)
         return FALSE;
-      pReference->SetRef(pDoc, newobjnum);  //, 0);
+      pReference->SetRef(pDoc, newobjnum);
       break;
     }
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pDict = pObj->AsDictionary();
 
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key("");
         CPDF_Object* pNextObj = pDict->GetNextElement(pos, key);
         if (!FXSYS_strcmp(key, "Parent") || !FXSYS_strcmp(key, "Prev") ||
@@ skipping 178 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;
 }