XFA: merge patch from CL 733693003, getting rid of more casts

fpdfsdk/src/javascript/Field.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/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 176 matching lines @@
         CPDF_InterForm* pInterForm = pRDInterForm->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CFX_WideString swFieldNameTemp = csFieldName;
         swFieldNameTemp.Replace(L"..", L".");
 
         if (pInterForm->CountFields(swFieldNameTemp) <= 0)
         {
                 std::wstring strFieldName;
                 int iControlNo = -1;
-                ParseFieldName((FX_LPCWSTR)swFieldNameTemp, strFieldName, iControlNo);
+                ParseFieldName(swFieldNameTemp.c_str(), strFieldName, iControlNo);
                 if (iControlNo == -1) return FALSE;
                 
                 m_FieldName = strFieldName.c_str();
                 m_nFormControlIndex = iControlNo;
                 return TRUE;
         }
 
         m_FieldName = swFieldNameTemp;
         m_nFormControlIndex = -1;
 
@@ skipping 1358 matching lines @@
         {
                 CJS_Array ExportValusArray(m_isolate);
 
                 if (m_nFormControlIndex < 0)
                 {
                         for (int i=0,sz=pFormField->CountControls(); i<sz; i++)
                         {
                                 CPDF_FormControl* pFormControl = pFormField->GetControl(i);
                                 ASSERT(pFormControl != NULL);
 
-                                ExportValusArray.SetElement(i, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue()));
+                                ExportValusArray.SetElement(i, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
                         }
                 }
                 else
                 {
                         if(m_nFormControlIndex >= pFormField->CountControls()) return FALSE;
                         CPDF_FormControl* pFormControl = pFormField->GetControl(m_nFormControlIndex);
                         if (!pFormControl) return FALSE;
 
-                        ExportValusArray.SetElement(0, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue()));
+                        ExportValusArray.SetElement(0, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
                 }
 
                 vp << ExportValusArray;
         }
 
         return TRUE;
 }
 
 FX_BOOL Field::fileSelect(OBJ_PROP_PARAMS)
 {
@@ skipping 1719 matching lines @@
                         vp << L"Yes";
                 else
                         vp << L"Off";
         }
         else if (pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON && !(pFormField->GetFieldFlags() & FIELDFLAG_RADIOSINUNISON))
         {
                 for (int i=0, sz=pFormField->CountControls(); i<sz; i++)
                 {
                         if (pFormField->GetControl(i)->IsChecked())
                         {
-                                vp << (FX_LPCWSTR)pFormField->GetControl(i)->GetExportValue();
+                                vp << pFormField->GetControl(i)->GetExportValue().c_str();
                                 break;
                         }
                         else
                                 vp << L"Off";
                 }
         }
         else if (pFormField->GetFieldType() == FIELDTYPE_LISTBOX && (pFormField->CountSelectedItems() > 1))
         {
                 vp << L"";
         }
         else
-                vp << (FX_LPCWSTR)pFormField->GetValue();
+                vp << pFormField->GetValue().c_str();
 
         return TRUE;
 }
 
 /* --------------------------------- methods --------------------------------- */
 
 FX_BOOL Field::browseForFileToSubmit(OBJ_METHOD_PARAMS)
 {
         ASSERT(m_pDocument != NULL);
 
@@ skipping 771 matching lines @@
 
 #define JS_FIELD_MINWIDTH       1
 #define JS_FIELD_MINHEIGHT      1
 
 void Field::AddField(CPDFSDK_Document* pDocument, int nPageIndex, int nFieldType,
                                                         const CFX_WideString& sName, const CPDF_Rect& rcCoords)
 {
         //Not supported.
 }