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

fpdfsdk/src/formfiller/FFL_ListBox.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_ListBox.h"
 //#include "../../include/formfiller/FFL_Module.h"
@@ skipping 58 matching lines @@
 CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView)
 {
         CPWL_ListBox* pWnd = new CPWL_ListBox();
         pWnd->AttachFFLData(this);
         pWnd->Create(cp);
 
         ASSERT(m_pApp != NULL);
         CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller();
         pWnd->SetFillerNotify(pIFormFiller);
 
-        ASSERT(m_pWidget != NULL);
-        
         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());
+
         if (pWnd->HasFlag(PLBS_MULTIPLESEL))
         {
                 m_OriginSelections.RemoveAll();
                 
                 FX_BOOL bSetCaret = FALSE;
                 for (FX_INT32 i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
                 {
                         if (m_pWidget->IsOptionSelected(i))
                         {
                                 if (!bSetCaret)
@@ skipping 216 matching lines @@
 
                         if (CommitData(pPageView, nFlag))
                         {
                                 DestroyPDFWindow(pPageView);
                                 m_bValid = FALSE;
                         }
                 }
         }
 }