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

fpdfsdk/src/javascript/Document.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 352 matching lines @@
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
                 return FALSE;
         }
 
         CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
         CPDF_FormField* pField = pPDFForm->GetField(nIndex);
         if (!pField)
                 return FALSE;
 
-        vRet = pField->GetFullName();
+        vRet = pField->GetFullName().c_str();
         return TRUE;
 }
 
 FX_BOOL Document::importAnFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
         return TRUE;
 }
 
 FX_BOOL Document::importAnXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
@@ skipping 487 matching lines @@
         CFX_WideString cwTrapped                = pDictionary->GetUnicodeText("Trapped");
 
         v8::Isolate* isolate = GetIsolate(cc);
         if (vp.IsGetting())
         {
                 CJS_Context* pContext = (CJS_Context *)cc;
                 CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
                 JSFXObject  pObj = JS_NewFxDynamicObj(*pRuntime, pContext, -1);
 
-                JS_PutObjectString(isolate,pObj, L"Author", cwAuthor);
-                JS_PutObjectString(isolate,pObj, L"Title", cwTitle);
-                JS_PutObjectString(isolate,pObj, L"Subject", cwSubject);
-                JS_PutObjectString(isolate,pObj, L"Keywords", cwKeywords);
-                JS_PutObjectString(isolate,pObj, L"Creator", cwCreator);
-                JS_PutObjectString(isolate,pObj, L"Producer", cwProducer);
-                JS_PutObjectString(isolate,pObj, L"CreationDate", cwCreationDate);
-                JS_PutObjectString(isolate,pObj, L"ModDate", cwModDate);
-                JS_PutObjectString(isolate,pObj, L"Trapped", cwTrapped);
+                JS_PutObjectString(isolate, pObj, L"Author", cwAuthor.c_str());
+                JS_PutObjectString(isolate, pObj, L"Title", cwTitle.c_str());
+                JS_PutObjectString(isolate, pObj, L"Subject", cwSubject.c_str());
+                JS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords.c_str());
+                JS_PutObjectString(isolate, pObj, L"Creator", cwCreator.c_str());
+                JS_PutObjectString(isolate, pObj, L"Producer", cwProducer.c_str());
+                JS_PutObjectString(isolate, pObj, L"CreationDate", cwCreationDate.c_str());
+                JS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
+                JS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
 
 // It's to be compatible to non-standard info dictionary.
                 FX_POSITION pos = pDictionary->GetStartPos();
                 while(pos)
                 {
                         CFX_ByteString bsKey;
                         CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey);
                         CFX_WideString wsKey  = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
                         if((pValueObj->GetType()==PDFOBJ_STRING) || (pValueObj->GetType()==PDFOBJ_NAME) )
-                                        JS_PutObjectString(isolate,pObj, wsKey, pValueObj->GetUnicodeText());
+                                JS_PutObjectString(isolate, pObj, wsKey.c_str(), pValueObj->GetUnicodeText().c_str());
                         if(pValueObj->GetType()==PDFOBJ_NUMBER)
-                                JS_PutObjectNumber(isolate,pObj, wsKey, (float)pValueObj->GetNumber());
+                                JS_PutObjectNumber(isolate,pObj, wsKey.c_str(), (float)pValueObj->GetNumber());
                         if(pValueObj->GetType()==PDFOBJ_BOOLEAN)
-                                JS_PutObjectBoolean(isolate,pObj, wsKey, (bool)pValueObj->GetInteger());
+                                JS_PutObjectBoolean(isolate,pObj, wsKey.c_str(), (bool)pValueObj->GetInteger());
                 }
 
                 vp << pObj;
                 return TRUE;
         }
         else
         {
                 return TRUE;
         }
 }
@@ skipping 751 matching lines @@
                         }
                 }
         }
 
         if (bStrip)
         {
                 swRet.TrimLeft();
                 swRet.TrimRight();
         }
 
-        vRet = swRet;
+        vRet = swRet.c_str();
         return TRUE;
 }
 
 FX_BOOL Document::getPageNthWordQuads(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
 
         return FALSE;
@@ skipping 275 matching lines @@
         {
                 m_DelayData.RemoveAt(DelArray[j]);
         }
 }
 
 CJS_Document* Document::GetCJSDoc() const 
 {
         return static_cast<CJS_Document*>(m_pJSObject);
 }