Merge to XFA: Remove some dead code.
Review URL: https://codereview.chromium.org/1186673005.
(cherry picked from commit 38f5c338fdc2daf79668cf7567298d9f62e4ba23)
Review URL: https://codereview.chromium.org/1198683002.
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index 3e5e5631..262e5f8 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -668,19 +668,6 @@
return pPDFInterForm->GetControlByDict(GetAnnotDict());
}
-static CPDF_Dictionary* BF_GetField(CPDF_Dictionary* pFieldDict, const FX_CHAR* name)
-{
- if (pFieldDict == NULL) return NULL;
- // First check the dictionary itself
- CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
- if (pAttr) return pFieldDict;
-
- // Now we need to search from parents
- CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
- if (pParent == NULL) return NULL;
-
- return BF_GetField(pParent, name);
-}
CPDF_FormControl* CPDFSDK_Widget::GetFormControl(CPDF_InterForm* pInterForm, CPDF_Dictionary* pAnnotDict)
{
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 3a0ac00..4c01609 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -62,35 +62,6 @@
IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods)
-struct stru_TbConvert
-{
- const FX_CHAR* lpszJSMark;
- const FX_CHAR* lpszCppMark;
-};
-
-static const stru_TbConvert fcTable[] = {
- { "mmmm","%B" },
- { "mmm", "%b" },
- { "mm", "%m" },
- //"m"
- { "dddd","%A" },
- { "ddd", "%a" },
- { "dd", "%d" },
- //"d", "%w",
- { "yyyy","%Y" },
- { "yy", "%y" },
- { "HH", "%H" },
- //"H"
- { "hh", "%I" },
- //"h"
- { "MM", "%M" },
- //"M"
- { "ss", "%S" },
- //"s
- { "tt", "%p" },
- //"t"
-};
-
static const FX_WCHAR* months[] =
{
L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"