Make CFX_WideString::FromLocal() take a CFX_ByteStringC arg

core/fpdfdoc/doc_basic.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 "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfdoc/doc_utils.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
@@ skipping 297 matching lines @@
   return result;
 #else
   return filepath;
 #endif
 }
 
 bool CPDF_FileSpec::GetFileName(CFX_WideString* csFileName) const {
   if (CPDF_Dictionary* pDict = m_pObj->AsDictionary()) {
     *csFileName = pDict->GetUnicodeTextBy("UF");
     if (csFileName->IsEmpty()) {
-      *csFileName = CFX_WideString::FromLocal(pDict->GetStringBy("F"));
+      *csFileName =
+          CFX_WideString::FromLocal(pDict->GetStringBy("F").AsByteStringC());

[Lei Zhang, 2016/04/07 19:21:59]

Use GetConstStringBy() instead?

[Tom Sepez, 2016/04/08 15:47:29]

Done.

     }
     if (pDict->GetStringBy("FS") == "URL")
       return true;
     if (csFileName->IsEmpty()) {
       if (pDict->KeyExist("DOS")) {
-        *csFileName = CFX_WideString::FromLocal(pDict->GetStringBy("DOS"));
+        *csFileName = CFX_WideString::FromLocal(
+            pDict->GetStringBy("DOS").AsByteStringC());
       } else if (pDict->KeyExist("Mac")) {
-        *csFileName = CFX_WideString::FromLocal(pDict->GetStringBy("Mac"));
+        *csFileName = CFX_WideString::FromLocal(
+            pDict->GetStringBy("Mac").AsByteStringC());
       } else if (pDict->KeyExist("Unix")) {
-        *csFileName = CFX_WideString::FromLocal(pDict->GetStringBy("Unix"));
+        *csFileName = CFX_WideString::FromLocal(
+            pDict->GetStringBy("Unix").AsByteStringC());
       } else {
         return false;
       }
     }
   } else if (m_pObj->IsString()) {
-    *csFileName = CFX_WideString::FromLocal(m_pObj->GetString());
+    *csFileName =
+        CFX_WideString::FromLocal(m_pObj->GetString().AsByteStringC());
   } else {
     return false;
   }
   *csFileName = DecodeFileName(csFileName->AsWideStringC());
   return true;
 }
 
 CPDF_FileSpec::CPDF_FileSpec() {
   m_pObj = new CPDF_Dictionary;
   m_pObj->AsDictionary()->SetAtName("Type", "Filespec");
@@ skipping 163 matching lines @@
   bsLbl = bsOrig;
   int nPage = FXSYS_atoi(bsLbl);
   if (nPage > 0 && nPage <= nPages) {
     return nPage;
   }
   return -1;
 }
 int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const {
   return GetPageByLabel(PDF_EncodeText(wsLabel.c_str()).AsByteStringC());
 }