Add type cast definitions for CPDF_String.

core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.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 "../../../include/fpdfapi/fpdf_serial.h"
 CFDF_Document::CFDF_Document() : CPDF_IndirectObjects(NULL) {
   m_pRootDict = NULL;
   m_pFile = NULL;
@@ skipping 82 matching lines @@
         << FX_BSTRC("\r\nendobj\r\n\r\n");
   }
   buf << FX_BSTRC("trailer\r\n<</Root ") << m_pRootDict->GetObjNum()
       << FX_BSTRC(" 0 R>>\r\n%%EOF\r\n");
   return TRUE;
 }
 CFX_WideString CFDF_Document::GetWin32Path() const {
   CPDF_Dictionary* pDict =
       m_pRootDict ? m_pRootDict->GetDict(FX_BSTRC("FDF")) : NULL;
   CPDF_Object* pFileSpec = pDict ? pDict->GetElementValue(FX_BSTRC("F")) : NULL;
-  if (pFileSpec == NULL) {
+  if (!pFileSpec)
     return CFX_WideString();
-  }
-  if (pFileSpec->GetType() == PDFOBJ_STRING) {
+  if (pFileSpec->IsString())
     return FPDF_FileSpec_GetWin32Path(m_pRootDict->GetDict(FX_BSTRC("FDF")));
-  }
   return FPDF_FileSpec_GetWin32Path(pFileSpec);
 }
 static CFX_WideString ChangeSlash(const FX_WCHAR* str) {
   CFX_WideString result;
   while (*str) {
     if (*str == '\\') {
       result += '/';
     } else if (*str == '/') {
       result += '\\';
     } else {
@@ skipping 12 matching lines @@
     if (filepath[2] != '\\') {
       result += '/';
     }
     result += ChangeSlash(filepath.c_str() + 2);
   } else if (filepath.GetLength() > 1 && filepath[0] == '\\' &&
              filepath[1] == '\\') {
     result = ChangeSlash(filepath.c_str() + 1);
   } else {
     result = ChangeSlash(filepath.c_str());
   }
-  if (pFileSpec->GetType() == PDFOBJ_STRING) {
+
+  if (pFileSpec->IsString()) {
     pFileSpec->SetString(CFX_ByteString::FromUnicode(result));
+

[Lei Zhang, 2015/10/21 16:55:56]

no trailing blank line

[dsinclair, 2015/10/21 17:08:05]

Done.

   } else if (CPDF_Dictionary* pFileDict = pFileSpec->AsDictionary()) {
     pFileDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(result));
     pFileDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(result));
     pFileDict->RemoveAt(FX_BSTRC("FS"));
   }
 }
 CFX_WideString FPDF_FileSpec_GetWin32Path(const CPDF_Object* pFileSpec) {
   CFX_WideString wsFileName;
   if (!pFileSpec) {
     wsFileName = CFX_WideString();
@@ skipping 19 matching lines @@
     result += wsFileName[1];
     result += ':';
     result += ChangeSlash(wsFileName.c_str() + 2);
     return result;
   }
   CFX_WideString result;
   result += '\\';
   result += ChangeSlash(wsFileName.c_str());
   return result;
 }