2 files changed, 3 insertions, 5 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index 21d4b033ab..e7a4ac9dd3 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -464,7 +464,7 @@ void CPWL_Edit::OnKillFocus() {
   m_pEdit->SelectNone();
   SetCaret(FALSE, CFX_FloatPoint(0.0f, 0.0f), CFX_FloatPoint(0.0f, 0.0f));
 
-  SetCharSet(0);
+  SetCharSet(FXFONT_ANSI_CHARSET);
 
   if (!IsReadOnly()) {
     if (IPWL_FocusHandler* pFocusHandler = GetFocusHandler())
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index d4eab01cfd..e810ec6a8c 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -281,10 +281,10 @@ CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) {
 
   CFX_ByteString sFontName = GetDefaultFontByCharset(nCharset);
   if (m_pSystemHandler) {
-    if (m_pSystemHandler->FindNativeTrueTypeFont(nCharset, sFontName))
+    if (m_pSystemHandler->FindNativeTrueTypeFont(sFontName))
       return sFontName;
 
-    sFontName = "";
+    sFontName.clear();
   }
   return sFontName;
 }
@@ -437,8 +437,6 @@ CFX_ByteString CPWL_FontMap::GetDefaultFontByCharset(int32_t nCharset) {
 }
 
 int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
-  if (m_pSystemHandler && (-1 != m_pSystemHandler->GetCharSet()))
-    return m_pSystemHandler->GetCharSet();
   // to avoid CJK Font to show ASCII
   if (word < 0x7F)
     return ANSI_CHARSET;