Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR().

fpdfsdk/src/fsdk_baseform.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 "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
@@ skipping 2612 matching lines @@
 
 #ifdef _WIN32
 CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile)
 {
         ASSERT(m_pDocument != NULL);
         CPDF_Document* pDocument = m_pDocument->GetDocument()->GetPDFDoc();
         ASSERT(pDocument != NULL);
 
         CPDF_Stream* pRetStream = NULL;
 
-        if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile))
+        if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile.c_str()))
         {
                 int nWidth = pBmp->GetWidth();
                 int nHeight = pBmp->GetHeight();
 
                 CPDF_Image Image(pDocument);
                 Image.SetImage(pBmp, FALSE);
                 CPDF_Stream* pImageStream = Image.GetStream();
                 if (pImageStream)
                 {
                         if (pImageStream->GetObjNum() == 0)
@@ skipping 1144 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }