Remove dead code that was reactivated when fixing overrides.

fpdfsdk/src/pdfwindow/PWL_Edit.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/fxcrt/fx_safe_types.h"
 #include "../../../core/include/fxcrt/fx_xml.h"
 #include "../../include/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Caret.h"
@@ skipping 145 matching lines @@
   if (IFX_SystemHandler* pSH = GetSystemHandler())
     swClipboard = pSH->GetClipboardText(GetAttachedHWnd());
 
   if (m_pFillerNotify) {
     FX_BOOL bRC = TRUE;
     FX_BOOL bExit = FALSE;
     CFX_WideString strChangeEx;
     int nSelStart = 0;
     int nSelEnd = 0;
     GetSel(nSelStart, nSelEnd);
-    m_pFillerNotify->OnBeforeKeyStroke(TRUE, GetAttachedData(), 0, swClipboard,
+    m_pFillerNotify->OnBeforeKeyStroke(GetAttachedData(), swClipboard,
                                        strChangeEx, nSelStart, nSelEnd, TRUE,
                                        bRC, bExit, 0);
     if (!bRC)
       return;
     if (bExit)
       return;
   }
 
   if (swClipboard.GetLength() > 0) {
     Clear();
     InsertText(swClipboard.c_str());
   }
-
-  if (m_pFillerNotify) {
-    FX_BOOL bExit = FALSE;
-    m_pFillerNotify->OnAfterKeyStroke(TRUE, GetAttachedData(), bExit, 0);
-    if (bExit)
-      return;
-  }
 }
 
 void CPWL_Edit::CutText() {
   if (!CanCut())
     return;
 
   CFX_WideString str = m_pEdit->GetSelText();
 
   if (IFX_SystemHandler* pSH = GetSystemHandler())
     pSH->SetClipboardText(GetAttachedHWnd(), str);
@@ skipping 680 matching lines @@
       FX_BOOL bExit = FALSE;
       CFX_WideString strChange;
       CFX_WideString strChangeEx;
 
       int nSelStart = 0;
       int nSelEnd = 0;
       GetSel(nSelStart, nSelEnd);
 
       if (nSelStart == nSelEnd)
         nSelEnd = nSelStart + 1;
-      m_pFillerNotify->OnBeforeKeyStroke(
-          TRUE, GetAttachedData(), FWL_VKEY_Delete, strChange, strChangeEx,
-          nSelStart, nSelEnd, TRUE, bRC, bExit, nFlag);
+      m_pFillerNotify->OnBeforeKeyStroke(GetAttachedData(), strChange,
+                                         strChangeEx, nSelStart, nSelEnd, TRUE,
+                                         bRC, bExit, nFlag);
       if (!bRC)
         return FALSE;
       if (bExit)
         return FALSE;
     }
   }
 
   FX_BOOL bRet = CPWL_EditCtrl::OnKeyDown(nChar, nFlag);
 
-  if (nChar == FWL_VKEY_Delete) {
-    if (m_pFillerNotify) {
-      FX_BOOL bExit = FALSE;
-      m_pFillerNotify->OnAfterKeyStroke(TRUE, GetAttachedData(), bExit, nFlag);
-      if (bExit)
-        return FALSE;
-    }
-  }
-
   // In case of implementation swallow the OnKeyDown event.
   if (IsProceedtoOnChar(nChar, nFlag))
     return TRUE;
 
   return bRet;
 }
 
 /**
 *In case of implementation swallow the OnKeyDown event.
 *If the event is swallowed, implementation may do other unexpected things, which
@@ skipping 16 matching lines @@
     }
   }
   // control characters.
   switch (nKeyCode) {
     case FWL_VKEY_Escape:
     case FWL_VKEY_Back:
     case FWL_VKEY_Return:
     case FWL_VKEY_Space:
       return TRUE;
     default:
-      break;
+      return FALSE;
   }
-  return FALSE;
 }
 
 FX_BOOL CPWL_Edit::OnChar(FX_WORD nChar, FX_DWORD nFlag) {
   if (m_bMouseDown)
     return TRUE;
 
   FX_BOOL bRC = TRUE;
   FX_BOOL bExit = FALSE;
 
-  FX_BOOL bCtrl = IsCTRLpressed(nFlag);
-  if (!bCtrl) {
+  if (!IsCTRLpressed(nFlag)) {
     if (m_pFillerNotify) {
       CFX_WideString swChange;
-      int32_t nKeyCode;
 
       int nSelStart = 0;
       int nSelEnd = 0;
       GetSel(nSelStart, nSelEnd);
 
       switch (nChar) {
         case FWL_VKEY_Back:
-          nKeyCode = nChar;
           if (nSelStart == nSelEnd)
             nSelStart = nSelEnd - 1;
           break;
         case FWL_VKEY_Return:
-          nKeyCode = nChar;
           break;
         default:
-          nKeyCode = 0;
           swChange += nChar;
           break;
       }
 
       CFX_WideString strChangeEx;
-      m_pFillerNotify->OnBeforeKeyStroke(TRUE, GetAttachedData(), nKeyCode,
-                                         swChange, strChangeEx, nSelStart,
-                                         nSelEnd, TRUE, bRC, bExit, nFlag);
+      m_pFillerNotify->OnBeforeKeyStroke(GetAttachedData(), swChange,
+                                         strChangeEx, nSelStart, nSelEnd, TRUE,
+                                         bRC, bExit, nFlag);
     }
   }
 
   if (!bRC)
     return TRUE;
   if (bExit)
     return FALSE;
 
   if (IFX_Edit_FontMap* pFontMap = GetFontMap()) {
     int32_t nOldCharSet = GetCharSet();
     int32_t nNewCharSet = pFontMap->CharSetFromUnicode(nChar, DEFAULT_CHARSET);
     if (nOldCharSet != nNewCharSet) {
       SetCharSet(nNewCharSet);
     }
   }
-  FX_BOOL bRet = CPWL_EditCtrl::OnChar(nChar, nFlag);
 
-  if (!bCtrl) {
-    if (m_pFillerNotify) {
-      m_pFillerNotify->OnAfterKeyStroke(TRUE, GetAttachedData(), bExit, nFlag);
-      if (bExit)
-        return FALSE;
-    }
-  }
-
-  return bRet;
+  return CPWL_EditCtrl::OnChar(nChar, nFlag);
 }
 
 FX_BOOL CPWL_Edit::OnMouseWheel(short zDelta,
                                 const CPDF_Point& point,
                                 FX_DWORD nFlag) {
   if (HasFlag(PES_MULTILINE)) {
     CPDF_Point ptScroll = GetScrollPos();
 
     if (zDelta > 0) {
       ptScroll.y += GetFontSize();
@@ skipping 194 matching lines @@
 }
 
 void CPWL_Edit::GeneratePageObjects(CPDF_PageObjects* pPageObjects,
                                     const CPDF_Point& ptOffset) {
   CFX_ArrayTemplate<CPDF_TextObject*> ObjArray;
   IFX_Edit::GeneratePageObjects(
       pPageObjects, m_pEdit, ptOffset, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       ObjArray);
 }