Rename both As{Byte,Wide}StringC() helpers to AsStringC().

fpdfsdk/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 <map>
 #include <memory>
@@ skipping 92 matching lines @@
     CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
     CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(pPageNums->at(i) - 1);
     if (!pSrcPageDict || !pCurPageDict)
       return FALSE;
 
     // Clone the page dictionary
     for (const auto& it : *pSrcPageDict) {
       const CFX_ByteString& cbSrcKeyStr = it.first;
       CPDF_Object* pObj = it.second;
       if (cbSrcKeyStr.Compare(("Type")) && cbSrcKeyStr.Compare(("Parent"))) {
-        if (pCurPageDict->KeyExist(cbSrcKeyStr.AsByteStringC()))
-          pCurPageDict->RemoveAt(cbSrcKeyStr.AsByteStringC());
-        pCurPageDict->SetAt(cbSrcKeyStr.AsByteStringC(), pObj->Clone());
+        if (pCurPageDict->KeyExist(cbSrcKeyStr.AsStringC()))
+          pCurPageDict->RemoveAt(cbSrcKeyStr.AsStringC());
+        pCurPageDict->SetAt(cbSrcKeyStr.AsStringC(), pObj->Clone());
       }
     }
 
     // inheritable item
     CPDF_Object* pInheritable = nullptr;
     // 1 MediaBox  //required
     if (!pCurPageDict->KeyExist("MediaBox")) {
       pInheritable = PageDictGetInheritableTag(pSrcPageDict, "MediaBox");
       if (!pInheritable) {
         // Search the "CropBox" from source page dictionary,
@@ skipping 96 matching lines @@
       while (it != pDict->end()) {
         const CFX_ByteString& key = it->first;
         CPDF_Object* pNextObj = it->second;
         ++it;
         if (!FXSYS_strcmp(key, "Parent") || !FXSYS_strcmp(key, "Prev") ||
             !FXSYS_strcmp(key, "First")) {
           continue;
         }
         if (pNextObj) {
           if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
-            pDict->RemoveAt(key.AsByteStringC());
+            pDict->RemoveAt(key.AsStringC());
         } else {
           return FALSE;
         }
       }
       break;
     }
     case CPDF_Object::ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       uint32_t count = pArray->GetCount();
       for (uint32_t i = 0; i < count; ++i) {
@@ skipping 160 matching lines @@
   if (!pSrcDict)
     return FALSE;
 
   CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
   if (!pDstDict)
     return FALSE;
 
   pDstDict->SetAt("ViewerPreferences", pSrcDict->Clone(TRUE));
   return TRUE;
 }