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

fpdfsdk/src/fsdk_annothandler.cpp

Index: fpdfsdk/src/fsdk_annothandler.cpp
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index fff038b809eea4c674b808aafd8f45afa00a1bf8..a9e21219a1db33ce33911f34386a65ab78eeafae 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -734,20 +734,17 @@ void CPDFSDK_BFAnnotHandler::OnLoad(CPDFSDK_Annot* pAnnot)
 	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);
 			}
 		}
 		
@@ -760,7 +757,6 @@ void CPDFSDK_BFAnnotHandler::OnLoad(CPDFSDK_Annot* pAnnot)
 
 		if (m_pFormFiller)
 			m_pFormFiller->OnLoad(pAnnot);
-
 	}
 }