Merge to XFA: Member function name refactoring

fpdfsdk/src/fpdf_ext.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_ext.h"
 
 #include "core/include/fxcrt/fx_xml.h"
 #include "fpdfsdk/include/fsdk_define.h"
@@ skipping 51 matching lines @@
 }
 
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot) {
   CFX_ByteString cbSubType = pPDFAnnot->GetSubType();
   if (cbSubType.Compare("3D") == 0) {
     FPDF_UnSupportError(FPDF_UNSP_ANNOT_3DANNOT);
   } else if (cbSubType.Compare("Screen") == 0) {
     const CPDF_Dictionary* pAnnotDict = pPDFAnnot->GetAnnotDict();
     CFX_ByteString cbString;
     if (pAnnotDict->KeyExist("IT"))
-      cbString = pAnnotDict->GetString("IT");
+      cbString = pAnnotDict->GetStringBy("IT");
     if (cbString.Compare("Img") != 0)
       FPDF_UnSupportError(FPDF_UNSP_ANNOT_SCREEN_MEDIA);
   } else if (cbSubType.Compare("Movie") == 0) {
     FPDF_UnSupportError(FPDF_UNSP_ANNOT_MOVIE);
   } else if (cbSubType.Compare("Sound") == 0) {
     FPDF_UnSupportError(FPDF_UNSP_ANNOT_SOUND);
   } else if (cbSubType.Compare("RichMedia") == 0) {
     FPDF_UnSupportError(FPDF_UNSP_ANNOT_SCREEN_RICHMEDIA);
   } else if (cbSubType.Compare("FileAttachment") == 0) {
     FPDF_UnSupportError(FPDF_UNSP_ANNOT_ATTACHMENT);
   } else if (cbSubType.Compare("Widget") == 0) {
     const CPDF_Dictionary* pAnnotDict = pPDFAnnot->GetAnnotDict();
     CFX_ByteString cbString;
     if (pAnnotDict->KeyExist("FT")) {
-      cbString = pAnnotDict->GetString("FT");
+      cbString = pAnnotDict->GetStringBy("FT");
     }
     if (cbString.Compare("Sig") == 0) {
       FPDF_UnSupportError(FPDF_UNSP_ANNOT_SIG);
     }
   }
 }
 
 FX_BOOL CheckSharedForm(const CXML_Element* pElement, CFX_ByteString cbName) {
   int count = pElement->CountAttrs();
   int i = 0;
@@ skipping 45 matching lines @@
 
   // Portfolios and Packages
   CPDF_Dictionary* pRootDict = pDoc->GetRoot();
   if (pRootDict) {
     CFX_ByteString cbString;
     if (pRootDict->KeyExist("Collection")) {
       FPDF_UnSupportError(FPDF_UNSP_DOC_PORTABLECOLLECTION);
       return;
     }
     if (pRootDict->KeyExist("Names")) {
-      CPDF_Dictionary* pNameDict = pRootDict->GetDict("Names");
+      CPDF_Dictionary* pNameDict = pRootDict->GetDictBy("Names");
       if (pNameDict && pNameDict->KeyExist("EmbeddedFiles")) {
         FPDF_UnSupportError(FPDF_UNSP_DOC_ATTACHMENT);
         return;
       }
       if (pNameDict && pNameDict->KeyExist("JavaScript")) {
-        CPDF_Dictionary* pJSDict = pNameDict->GetDict("JavaScript");
-        CPDF_Array* pArray = pJSDict ? pJSDict->GetArray("Names") : NULL;
+        CPDF_Dictionary* pJSDict = pNameDict->GetDictBy("JavaScript");
+        CPDF_Array* pArray = pJSDict ? pJSDict->GetArrayBy("Names") : NULL;
         if (pArray) {
           int nCount = pArray->GetCount();
           for (int i = 0; i < nCount; i++) {
-            CFX_ByteString cbStr = pArray->GetString(i);
+            CFX_ByteString cbStr = pArray->GetStringAt(i);
             if (cbStr.Compare("com.adobe.acrobat.SharedReview.Register") == 0) {
               FPDF_UnSupportError(FPDF_UNSP_DOC_SHAREDREVIEW);
               return;
             }
           }
         }
       }
     }
   }
 
@@ skipping 35 matching lines @@
     return PAGEMODE_USETHUMBS;
   if (strPageMode.EqualNoCase("FullScreen"))
     return PAGEMODE_FULLSCREEN;
   if (strPageMode.EqualNoCase("UseOC"))
     return PAGEMODE_USEOC;
   if (strPageMode.EqualNoCase("UseAttachments"))
     return PAGEMODE_USEATTACHMENTS;
 
   return PAGEMODE_UNKNOWN;
 }