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

core/src/fpdfdoc/doc_formfield.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/fpdfdoc/fpdf_doc.h"
 CFX_WideString          GetFullName(CPDF_Dictionary* pFieldDict);
 void                            SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray);
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField *pField)
@@ skipping 628 matching lines @@
                 }
             } else if (m_Type == ComboBox) {
                 m_pDict->RemoveAt("V");
                 m_pDict->RemoveAt("I");
             }
         }
     } else {
         if (m_Type == ListBox) {
             SelectOption(index, TRUE);
             if (!(m_Flags & FORMLIST_MULTISELECT)) {
-                m_pDict->SetAtString("V", PDF_EncodeText(opt_value, opt_value.GetLength()));
+                m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
             } else {
                 CPDF_Array* pArray = CPDF_Array::Create();
                 if (pArray == NULL) {
                     return FALSE;
                 }
                 FX_BOOL bSelected;
                 int iCount = CountOptions();
                 for (int i = 0; i < iCount; i ++) {
                     if (i != index) {
                         bSelected = IsItemSelected(i);
                     } else {
                         bSelected = TRUE;
                     }
                     if (bSelected) {
                         opt_value = GetOptionValue(i);
                         pArray->AddString(PDF_EncodeText(opt_value));
                     }
                 }
                 m_pDict->SetAt("V", pArray);
             }
         } else if (m_Type == ComboBox) {
-            m_pDict->SetAtString("V", PDF_EncodeText(opt_value, opt_value.GetLength()));
+            m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
             CPDF_Array* pI = CPDF_Array::Create();
             if (pI == NULL) {
                 return FALSE;
             }
             pI->AddInteger(index);
             m_pDict->SetAt("I", pI);
         }
     }
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         if (GetType() == ListBox) {
@@ skipping 94 matching lines @@
 {
     int iCount = CountOptions();
     for (int i = 0; i < iCount; i ++) {
         CFX_WideString csValue = GetOptionValue(i);
         if (csValue == csOptLabel) {
             return i;
         }
     }
     return -1;
 }
-int CPDF_FormField::FindOptionValue(FX_LPCWSTR csOptValue, int iStartIndex)
+int CPDF_FormField::FindOptionValue(const CFX_WideString& csOptValue, int iStartIndex)
 {
     if (iStartIndex < 0) {
         iStartIndex = 0;
     }
     int iCount = CountOptions();
     for (; iStartIndex < iCount; iStartIndex ++) {
         CFX_WideString csValue = GetOptionValue(iStartIndex);
         if (csValue == csOptValue) {
             return iStartIndex;
         }
@@ skipping 78 matching lines @@
     if (pControl == NULL) {
         return FALSE;
     }
     if (!bChecked && pControl->IsChecked() == bChecked) {
         return FALSE;
     }
     CFX_ByteArray statusArray;
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         SaveCheckedFieldStatus(this, statusArray);
     }
-    CFX_WideString csWExport =  pControl->GetExportValue();
+    CFX_WideString csWExport = pControl->GetExportValue();
     CFX_ByteString csBExport = PDF_EncodeText(csWExport);
     int iCount = CountControls();
     FX_BOOL bUnison = PDF_FormField_IsUnison(this);
     for (int i = 0; i < iCount; i ++) {
         CPDF_FormControl* pCtrl = GetControl(i);
         if (bUnison) {
             CFX_WideString csEValue = pCtrl->GetExportValue();
             if (csEValue == csWExport) {
                 if (pCtrl->GetOnStateName() == pControl->GetOnStateName()) {
                     pCtrl->CheckControl(bChecked);
@@ skipping 271 matching lines @@
     if (m_pForm->m_pFormDict && m_pForm->m_pFormDict->GetDict("DR") &&
         m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font") )
     pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(font_name);
 
     if (pFontDict == NULL) {
         return;
     }
     m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
     m_FontSize = FX_atof(syntax.GetWord());
 }