Merge to XFA: patch from CL 730993002
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
index fc03c05..4b1f20a 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/src/javascript/Field.cpp
@@ -149,7 +149,7 @@
 		return;
 	}
 	std::wstring suffixal = strFieldNameParsed.substr(iStart+1);
-	iControlNo = FXSYS_wtoi((FX_LPCWSTR)suffixal.c_str());
+	iControlNo = FXSYS_wtoi(suffixal.c_str());
 	if (iControlNo == 0)
 	{
 		int iStart;
@@ -194,7 +194,7 @@
 	{
 		std::wstring strFieldName;
 		int iControlNo = -1;
-		ParseFieldName((wchar_t*)(FX_LPCWSTR)swFieldNameTemp, strFieldName, iControlNo);
+		ParseFieldName((FX_LPCWSTR)swFieldNameTemp, strFieldName, iControlNo);
 		if (iControlNo == -1) return FALSE;
 		
 		m_FieldName = strFieldName.c_str();