2 files changed, 7 insertions, 7 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 9e232f1017..38901dde8a 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -225,7 +225,7 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) {
   if (pRoot == NULL) {
     return FALSE;
   }
-  CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
+  CPDF_Dictionary* pAcroForm = pRoot->GetDictBy("AcroForm");
   if (pAcroForm == NULL) {
     return FALSE;
   }
@@ -238,7 +238,7 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) {
     CPDF_Array* pXFAArray = (CPDF_Array*)pElementXFA;
     FX_DWORD count = pXFAArray->GetCount() / 2;
     for (FX_DWORD i = 0; i < count; i++) {
-      CPDF_Stream* pStream = pXFAArray->GetStream(i * 2 + 1);
+      CPDF_Stream* pStream = pXFAArray->GetStreamAt(i * 2 + 1);
       if (pStream != NULL) {
         xfaStreams.Add(pStream);
       }
@@ -334,11 +334,11 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
   if (pRoot == NULL) {
     return NULL;
   }
-  CPDF_Dictionary* pNames = pRoot->GetDict("Names");
+  CPDF_Dictionary* pNames = pRoot->GetDictBy("Names");
   if (!pNames) {
     return NULL;
   }
-  CPDF_Dictionary* pXFAImages = pNames->GetDict("XFAImages");
+  CPDF_Dictionary* pXFAImages = pNames->GetDictBy("XFAImages");
   if (!pXFAImages) {
     return NULL;
   }
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index 3bc03872df..57061deb1f 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -1854,11 +1854,11 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
     return NULL;
   }
   CPDF_Dictionary* pFontSetDict =
-      pDoc->GetRoot()->GetDict("AcroForm")->GetDict("DR");
+      pDoc->GetRoot()->GetDictBy("AcroForm")->GetDictBy("DR");
   if (!pFontSetDict) {
     return NULL;
   }
-  pFontSetDict = (CPDF_Dictionary*)pFontSetDict->GetDict("Font");
+  pFontSetDict = (CPDF_Dictionary*)pFontSetDict->GetDictBy("Font");
   if (!pFontSetDict) {
     return NULL;
   }
@@ -1875,7 +1875,7 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
       return NULL;
     }
     CPDF_Dictionary* pFontDict = (CPDF_Dictionary*)pDirect;
-    if (pFontDict->GetString("Type") != "Font") {
+    if (pFontDict->GetStringBy("Type") != "Font") {
       return NULL;
     }
     CPDF_Font* pPDFFont = pDoc->LoadFont(pFontDict);