Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString().

fpdfsdk/src/formfiller/FFL_ComboBox.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/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
@@ skipping 59 matching lines @@
 
         return cp;
 }
 
 CPWL_Wnd* CFFL_ComboBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView)
 {
         CPWL_ComboBox * pWnd = new CPWL_ComboBox();
         pWnd->AttachFFLData(this);
         pWnd->Create(cp);
 
-        ASSERT(m_pApp != NULL);
         CFFL_IFormFiller* pFormFiller = m_pApp->GetIFormFiller();
         pWnd->SetFillerNotify(pFormFiller);
 
-        ASSERT(m_pWidget != NULL);
         FX_INT32 nCurSel = m_pWidget->GetSelectedIndex(0);
-        
         CFX_WideString swText;
-        
         if (nCurSel < 0)
                 swText = m_pWidget->GetValue();
         else
                 swText = m_pWidget->GetOptionLabel(nCurSel);
-        
+
         for (FX_INT32 i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
         {
-                pWnd->AddString(m_pWidget->GetOptionLabel(i));                  
+                pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str());
         }
-        
+
         pWnd->SetSelect(nCurSel);
-        pWnd->SetText(swText);
-        
+        pWnd->SetText(swText.c_str());
         return pWnd;
 }
 
 
 FX_BOOL CFFL_ComboBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
 {
         return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
 }
 
 FX_BOOL CFFL_ComboBox::IsDataChanged(CPDFSDK_PageView* pPageView)
@@ skipping 126 matching lines @@
                                                                         const PDFSDK_FieldAction& fa)
 {
         switch (type)
         {
         case CPDF_AAction::KeyStroke:
                 if (CPWL_ComboBox* pComboBox = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE))
                 {
                         if (CPWL_Edit* pEdit = (CPWL_Edit*)*pComboBox)
                         {
                                 pEdit->SetSel(fa.nSelStart, fa.nSelEnd);
-                                pEdit->ReplaceSel(fa.sChange);
+                                pEdit->ReplaceSel(fa.sChange.c_str());
                         }
                 }
                 break;
         default:
                 break;
         }
 }
 
 FX_BOOL CFFL_ComboBox::IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld, 
                                                                         const PDFSDK_FieldAction& faNew)
@@ skipping 31 matching lines @@
         ASSERT(pPageView != NULL);
 
         if (CPWL_ComboBox* pComboBox = (CPWL_ComboBox*)GetPDFWindow(pPageView, TRUE))
         {
                 if (m_State.nIndex >= 0)
                         pComboBox->SetSelect(m_State.nIndex);
                 else
                 {
                         if (CPWL_Edit* pEdit = (CPWL_Edit*)*pComboBox)
                         {
-                                pEdit->SetText(m_State.sValue);
+                                pEdit->SetText(m_State.sValue.c_str());
                                 pEdit->SetSel(m_State.nStart, m_State.nEnd);
                         }
                 }
         }
 }
 
 CPWL_Wnd* CFFL_ComboBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue)
 {
         if (bRestoreValue)
                 SaveState(pPageView);
@@ skipping 135 matching lines @@
                 if (CPDF_FormField * pFormField = m_pWidget->GetFormField())
                 {
                         swRet = pFormField->GetOptionValue(nExport);
                         if (swRet.IsEmpty())
                                 swRet = pFormField->GetOptionLabel(nExport);
                 }
         }
         
         return swRet;
 }