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

fpdfsdk/src/fsdk_annothandler.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/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/fsdk_mgr.h"
@@ skipping 716 matching lines @@
         ASSERT(pDoc != NULL);
         
         CFX_ByteString sSubType = pAnnot->GetSubType();
         
         if (sSubType == BFFT_SIGNATURE)
         {
         }
         else
         {
                 CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
-                
-        if (!pWidget->IsAppearanceValid())
+                if (!pWidget->IsAppearanceValid())
                         pWidget->ResetAppearance(NULL, FALSE);
-                
+
                 int nFieldType = pWidget->GetFieldType();
-                
                 if (nFieldType == FIELDTYPE_TEXTFIELD || nFieldType == FIELDTYPE_COMBOBOX)
                 {
                         FX_BOOL bFormated = FALSE;
                         CFX_WideString sValue = pWidget->OnFormat(0, bFormated);
-                        
                         if (bFormated && nFieldType == FIELDTYPE_COMBOBOX)
                         {
-                                pWidget->ResetAppearance(sValue, FALSE);
+                                pWidget->ResetAppearance(sValue.c_str(), FALSE);
                         }
                 }
                 
                 if (pDoc->GetDocType() == DOCTYPE_STATIC_XFA) 
                 {
                         if (!pWidget->IsAppearanceValid() && !pWidget->GetValue().IsEmpty())
                                 pWidget->ResetAppearance(FALSE);
                 }
                 
 
                 if (m_pFormFiller)
                         m_pFormFiller->OnLoad(pAnnot);
-
         }
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag)
 {
         ASSERT(pAnnot != NULL);
         CFX_ByteString sSubType = pAnnot->GetSubType();
         
         if (sSubType == BFFT_SIGNATURE)
         {
@@ skipping 634 matching lines @@
                                 m_pIteratorAnnotList.RemoveAt(i);
                                 m_pIteratorAnnotList.InsertAt(0, pReaderAnnot);
                                 break;
                         }       
                 }
         }
 
         return TRUE;
 }