Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.

fpdfsdk/fsdk_baseform.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/include/fsdk_baseform.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 448 matching lines @@
   switch (nFieldType) {
     case FIELDTYPE_PUSHBUTTON:
     case FIELDTYPE_COMBOBOX:
     case FIELDTYPE_LISTBOX:
     case FIELDTYPE_TEXTFIELD:
     case FIELDTYPE_SIGNATURE:
       return psub->IsStream();
     case FIELDTYPE_CHECKBOX:
     case FIELDTYPE_RADIOBUTTON:
       if (CPDF_Dictionary* pSubDict = psub->AsDictionary()) {
-        return pSubDict->GetStreamBy(GetAppState()) != NULL;
+        return !!pSubDict->GetStreamBy(GetAppState().AsByteStringC());
       }
       return FALSE;
   }
   return TRUE;
 }
 
 int CPDFSDK_Widget::GetFieldType() const {
   return GetFormField()->GetFieldType();
 }
 
@@ skipping 1326 matching lines @@
 
   return crFill;
 }
 
 void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType,
                                           CPDF_Stream* pImage) {
   CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
   ASSERT(pDoc);
 
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictBy("AP");
-  CPDF_Stream* pStream = pAPDict->GetStreamBy(sAPType);
+  CPDF_Stream* pStream = pAPDict->GetStreamBy(sAPType.AsByteStringC());
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   CFX_ByteString sImageAlias = "IMG";
 
   if (CPDF_Dictionary* pImageDict = pImage->GetDict()) {
     sImageAlias = pImageDict->GetStringBy("Name");
     if (sImageAlias.IsEmpty())
       sImageAlias = "IMG";
   }
 
   CPDF_Dictionary* pStreamResList = pStreamDict->GetDictBy("Resources");
   if (!pStreamResList) {
     pStreamResList = new CPDF_Dictionary();
     pStreamDict->SetAt("Resources", pStreamResList);
   }
 
   if (pStreamResList) {
     CPDF_Dictionary* pXObject = new CPDF_Dictionary;
-    pXObject->SetAtReference(sImageAlias, pDoc, pImage);
+    pXObject->SetAtReference(sImageAlias.AsByteStringC(), pDoc, pImage);
     pStreamResList->SetAt("XObject", pXObject);
   }
 }
 
 void CPDFSDK_Widget::RemoveAppearance(const CFX_ByteString& sAPType) {
   if (CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictBy("AP")) {
-    pAPDict->RemoveAt(sAPType);
+    pAPDict->RemoveAt(sAPType.AsByteStringC());
   }
 }
 
 FX_BOOL CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type,
                                   PDFSDK_FieldAction& data,
                                   CPDFSDK_PageView* pPageView) {
   CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
   CPDFDoc_Environment* pEnv = pDocument->GetEnv();
 
 #ifdef PDF_ENABLE_XFA
@@ skipping 977 matching lines @@
       break;
     }
   }
 }
 
 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
   CFX_FloatRect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }