diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-10 15:23:23 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-10 15:23:23 -0700 |
| commit | 0aa0e7331b3512066df3e33d6642456a0de63de7 (patch) | |
| tree | beb51a4f1d45c4acdf4133fd3fef81fad4e35594 /fpdfsdk/src/javascript/JS_EventHandler.cpp | |
| parent | 71b0378c7ce0bf8bfa54eddb2c2734729bae27f1 (diff) | |
| download | pdfium-0aa0e7331b3512066df3e33d6642456a0de63de7.tar.xz | |
Merge to XFA: Cleanup: Remove CFFL_IFormFiller::GetCommitKey() that always returns 0.
Remove callers and related code that all just pass zeros around.
Also remove CFFL_IFormFiller::GetKeyDown().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1149623012.
(cherry picked from commit 35c3163d55bebea8095474181f807ddfb2f4f806)
Review URL: https://codereview.chromium.org/1175083003.
Diffstat (limited to 'fpdfsdk/src/javascript/JS_EventHandler.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_EventHandler.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index fe4f6b2d4c..1fab82f74e 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -188,7 +188,7 @@ void CJS_EventHandler::OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_Form m_pValue = (CFX_WideString*)&Value; } -void CJS_EventHandler::OnField_Keystroke(int nCommitKey, CFX_WideString &strChange, +void CJS_EventHandler::OnField_Keystroke(CFX_WideString &strChange, const CFX_WideString& strChangeEx, FX_BOOL KeyDown, FX_BOOL bModifier, int& nSelEnd, int& nSelStart, FX_BOOL bShift, CPDF_FormField* pTarget, @@ -197,7 +197,7 @@ void CJS_EventHandler::OnField_Keystroke(int nCommitKey, CFX_WideString &strChan { Initial(JET_FIELD_KEYSTROKE); - m_nCommitKey = nCommitKey; + m_nCommitKey = 0; m_pWideStrChange = &strChange; m_WideStrChangeEx = strChangeEx; m_bKeyDown = KeyDown; @@ -243,12 +243,13 @@ void CJS_EventHandler::OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField m_pbRc = &bRc; } -void CJS_EventHandler::OnField_Format(int nCommitKey, CPDF_FormField* pTarget, - CFX_WideString& Value, FX_BOOL bWillCommit) +void CJS_EventHandler::OnField_Format(CPDF_FormField* pTarget, + CFX_WideString& Value, + FX_BOOL bWillCommit) { Initial(JET_FIELD_FORMAT); - m_nCommitKey = nCommitKey; + m_nCommitKey = 0; ASSERT(pTarget != NULL); m_strTargetName = pTarget->GetFullName(); m_pValue = &Value; |