Remove CFX_{Byte,Wide}String::ConvertFrom().

core/src/fpdfdoc/doc_form.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 "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/src/fpdfdoc/doc_utils.h"
 #include "third_party/base/stl_util.h"
 
+namespace {
+
 const int nMaxRecursion = 32;
 
+const struct SupportFieldEncoding {
+  const FX_CHAR* m_name;
+  FX_WORD m_codePage;
+} g_fieldEncoding[] = {
+    {"BigFive", 950},
+    {"GBK", 936},
+    {"Shift-JIS", 932},
+    {"UHC", 949},
+};
+
+static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary* pFieldDict,

[Tom Sepez, 2016/02/19 17:02:47]

Nit: need not be static now that namespace'd anon.

[Lei Zhang, 2016/02/19 18:48:34]

Done.

+                                      CFX_WideString& csValue,
+                                      CFX_ByteString& bsEncoding) {
+  CFX_ByteString csBValue = pFieldDict->GetStringBy("V");
+  const size_t iCount = FX_ArraySize(g_fieldEncoding);
+  size_t i = 0;

[Tom Sepez, 2016/02/19 17:02:47]

Nit: maybe range-based for-loop.

[Lei Zhang, 2016/02/19 18:48:34]

Done, and more.

+  for (; i < iCount; ++i)
+    if (bsEncoding == g_fieldEncoding[i].m_name) {
+      break;

[Tom Sepez, 2016/02/19 17:02:47]

Nit: maybe do line 36 here and return rather than break and retest.

[Lei Zhang, 2016/02/19 18:48:34]

Done.

+    }
+  if (i < iCount) {
+    csValue =
+        CFX_WideString::FromCodePage(csBValue, g_fieldEncoding[i].m_codePage);
+    return;
+  }
+  CFX_ByteString csTemp = csBValue.Left(2);
+  if (csTemp == "\xFF\xFE" || csTemp == "\xFE\xFF") {
+    csValue = PDF_DecodeText(csBValue);
+  } else {
+    csValue = CFX_WideString::FromLocal(csBValue);
+  }
+}
+
+}  // namespace
+
 class CFieldNameExtractor {
  public:
   explicit CFieldNameExtractor(const CFX_WideString& full_name) {
     m_pStart = full_name.c_str();
     m_pEnd = m_pStart + full_name.GetLength();
     m_pCur = m_pStart;
   }
   void GetNext(const FX_WCHAR*& pSubName, FX_STRSIZE& size) {
     pSubName = m_pCur;
     while (m_pCur < m_pEnd && m_pCur[0] != L'.') {
@@ skipping 1058 matching lines @@
       } else {
         CPDF_Object* pV = FPDF_GetFieldAttr(pField->m_pDict, "V");
         if (pV)
           pFieldDict->SetAt("V", pV->Clone(TRUE));
       }
       pFields->Add(pFieldDict);
     }
   }
   return pDoc;
 }
-const struct _SupportFieldEncoding {
-  const FX_CHAR* m_name;
-  int32_t m_codePage;
-} g_fieldEncoding[] = {
-    {"BigFive", 950},
-    {"GBK", 936},
-    {"Shift-JIS", 932},
-    {"UHC", 949},
-};
-static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary* pFieldDict,
-                                      CFX_WideString& csValue,
-                                      CFX_ByteString& bsEncoding) {
-  CFX_ByteString csBValue = pFieldDict->GetStringBy("V");
-  int32_t iCount = sizeof(g_fieldEncoding) / sizeof(g_fieldEncoding[0]);
-  int32_t i = 0;
-  for (; i < iCount; ++i)
-    if (bsEncoding == g_fieldEncoding[i].m_name) {
-      break;
-    }
-  if (i < iCount) {
-    CFX_CharMap* pCharMap =
-        CFX_CharMap::GetDefaultMapper(g_fieldEncoding[i].m_codePage);
-    FXSYS_assert(pCharMap);
-    csValue.ConvertFrom(csBValue, pCharMap);
-    return;
-  }
-  CFX_ByteString csTemp = csBValue.Left(2);
-  if (csTemp == "\xFF\xFE" || csTemp == "\xFE\xFF") {
-    csValue = PDF_DecodeText(csBValue);
-  } else {
-    csValue = CFX_WideString::FromLocal(csBValue);
-  }
-}
+
 void CPDF_InterForm::FDF_ImportField(CPDF_Dictionary* pFieldDict,
                                      const CFX_WideString& parent_name,
                                      FX_BOOL bNotify,
                                      int nLevel) {
   CFX_WideString name;
   if (!parent_name.IsEmpty()) {
     name = parent_name + L".";
   }
   name += pFieldDict->GetUnicodeTextBy("T");
   CPDF_Array* pKids = pFieldDict->GetArrayBy("Kids");
@@ skipping 78 matching lines @@
     FDF_ImportField(pField, L"", bNotify);
   }
   if (bNotify && m_pFormNotify) {
     m_pFormNotify->AfterFormImportData(this);
   }
   return TRUE;
 }
 void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
   m_pFormNotify = (CPDF_FormNotify*)pNotify;
 }