Make CPDF_Dictionary methods take CFX_ByteString arguments

fpdfsdk/formfiller/cba_fontmap.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 "fpdfsdk/formfiller/cba_fontmap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
@@ skipping 141 matching lines @@
     return;
 
   CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDictBy("AP");
 
   if (!pAPDict) {
     pAPDict = new CPDF_Dictionary;
     m_pAnnotDict->SetAt("AP", pAPDict);
   }
 
   // to avoid checkbox and radiobutton
-  CPDF_Object* pObject = pAPDict->GetObjectBy(m_sAPType.AsStringC());
+  CPDF_Object* pObject = pAPDict->GetObjectBy(m_sAPType);
   if (ToDictionary(pObject))
     return;
 
-  CPDF_Stream* pStream = pAPDict->GetStreamBy(m_sAPType.AsStringC());
+  CPDF_Stream* pStream = pAPDict->GetStreamBy(m_sAPType);
   if (!pStream) {
     pStream = new CPDF_Stream(NULL, 0, NULL);
     int32_t objnum = m_pDocument->AddIndirectObject(pStream);
     pAPDict->SetAtReference(m_sAPType.AsStringC(), m_pDocument, objnum);
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
 
   if (!pStreamDict) {
     pStreamDict = new CPDF_Dictionary;
     pStream->InitStream(NULL, 0, pStreamDict);
   }
 
   if (pStreamDict) {
     CPDF_Dictionary* pStreamResList = pStreamDict->GetDictBy("Resources");
     if (!pStreamResList) {
       pStreamResList = new CPDF_Dictionary();
       pStreamDict->SetAt("Resources", pStreamResList);
     }
 
     if (pStreamResList) {
       CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDictBy("Font");
       if (!pStreamResFontList) {
         pStreamResFontList = new CPDF_Dictionary;
         int32_t objnum = m_pDocument->AddIndirectObject(pStreamResFontList);
         pStreamResList->SetAtReference("Font", m_pDocument, objnum);
       }
-      if (!pStreamResFontList->KeyExist(sAlias.AsStringC()))
-        pStreamResFontList->SetAtReference(sAlias.AsStringC(), m_pDocument,
+      if (!pStreamResFontList->KeyExist(sAlias))
+        pStreamResFontList->SetAtReference(sAlias, m_pDocument,
                                            pFont->GetFontDict());
     }
   }
 }
 
 CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString& sAlias) {
   CPDF_Dictionary* pAcroFormDict = NULL;
   const bool bWidget = (m_pAnnotDict->GetStringBy("Subtype") == "Widget");
   if (bWidget) {
     if (CPDF_Dictionary* pRootDict = m_pDocument->GetRoot())
@@ skipping 15 matching lines @@
   CPDF_Dictionary* pFontDict = NULL;
 
   if (!sDA.IsEmpty()) {
     CPDF_SimpleParser syntax(sDA.AsStringC());
     syntax.FindTagParamFromStart("Tf", 2);
     CFX_ByteString sFontName = syntax.GetWord();
     sAlias = PDF_NameDecode(sFontName).Mid(1);
 
     if (CPDF_Dictionary* pDRDict = m_pAnnotDict->GetDictBy("DR"))
       if (CPDF_Dictionary* pDRFontDict = pDRDict->GetDictBy("Font"))
-        pFontDict = pDRFontDict->GetDictBy(sAlias.AsStringC());
+        pFontDict = pDRFontDict->GetDictBy(sAlias);
 
     if (!pFontDict)
       if (CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDictBy("AP"))
         if (CPDF_Dictionary* pNormalDict = pAPDict->GetDictBy("N"))
           if (CPDF_Dictionary* pNormalResDict =
                   pNormalDict->GetDictBy("Resources"))
             if (CPDF_Dictionary* pResFontDict =
                     pNormalResDict->GetDictBy("Font"))
-              pFontDict = pResFontDict->GetDictBy(sAlias.AsStringC());
+              pFontDict = pResFontDict->GetDictBy(sAlias);
 
     if (bWidget) {
       if (!pFontDict) {
         if (pAcroFormDict) {
           if (CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictBy("DR"))
             if (CPDF_Dictionary* pDRFontDict = pDRDict->GetDictBy("Font"))
-              pFontDict = pDRFontDict->GetDictBy(sAlias.AsStringC());
+              pFontDict = pDRFontDict->GetDictBy(sAlias);
         }
       }
     }
   }
 
   return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr;
 }
 
 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
   m_sAPType = sAPType;
 
   Reset();
   Initialize();
 }