From 1f2489023f2b808c41071d992abceb646ade8e1b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 14 Sep 2016 10:38:17 -0700 Subject: Remove FFI_ from CPDFSDK_Environment method names The prefix doesn't add anything when used in CPDFSDK_Environment, remove. Review-Url: https://codereview.chromium.org/2338303002 --- fpdfsdk/formfiller/cffl_combobox.cpp | 4 +-- fpdfsdk/formfiller/cffl_formfiller.cpp | 4 +-- fpdfsdk/formfiller/cffl_iformfiller.cpp | 52 ++++++++++++++++----------------- fpdfsdk/formfiller/cffl_textfield.cpp | 8 ++--- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'fpdfsdk/formfiller') diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 7ff09b7948..448b0d94b9 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -271,8 +271,8 @@ void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) { int nCharacters = wsText.GetLength(); CFX_ByteString bsUTFText = wsText.UTF16LE_Encode(); unsigned short* pBuffer = (unsigned short*)bsUTFText.c_str(); - m_pApp->FFI_OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, - nCharacters, TRUE); + m_pApp->OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, + nCharacters, TRUE); } } diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 99fc0808ff..3248c3b6c5 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -565,7 +565,7 @@ FX_BOOL CFFL_FormFiller::IsFieldFull(CPDFSDK_PageView* pPageView) { #endif // PDF_ENABLE_XFA void CFFL_FormFiller::SetChangeMark() { - m_pApp->FFI_OnChange(); + m_pApp->OnChange(); } void CFFL_FormFiller::GetActionData(CPDFSDK_PageView* pPageView, @@ -615,7 +615,7 @@ void CFFL_FormFiller::InvalidateRect(double left, double right, double bottom) { UnderlyingPageType* pPage = m_pWidget->GetUnderlyingPage(); - m_pApp->FFI_Invalidate(pPage, left, top, right, bottom); + m_pApp->Invalidate(pPage, left, top, right, bottom); } CFFL_Button::CFFL_Button(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) diff --git a/fpdfsdk/formfiller/cffl_iformfiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp index 09e0109d79..5bbc6aff9c 100644 --- a/fpdfsdk/formfiller/cffl_iformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp @@ -138,8 +138,8 @@ void CFFL_IFormFiller::OnMouseEnter(CPDFSDK_PageView* pPageView, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnAAction(CPDF_AAction::CursorEnter, fa, pPageView); m_bNotifying = FALSE; @@ -173,8 +173,8 @@ void CFFL_IFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnAAction(CPDF_AAction::CursorExit, fa, pPageView); m_bNotifying = FALSE; @@ -211,8 +211,8 @@ FX_BOOL CFFL_IFormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlags); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlags); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlags); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlags); pWidget->OnAAction(CPDF_AAction::ButtonDown, fa, pPageView); m_bNotifying = FALSE; @@ -292,8 +292,8 @@ void CFFL_IFormFiller::OnButtonUp(CPDFSDK_Widget* pWidget, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnAAction(CPDF_AAction::ButtonUp, fa, pPageView); m_bNotifying = FALSE; @@ -426,8 +426,8 @@ FX_BOOL CFFL_IFormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, TRUE); if (!pFormFiller) @@ -469,8 +469,8 @@ FX_BOOL CFFL_IFormFiller::OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa); @@ -648,8 +648,8 @@ void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); fa.bWillCommit = TRUE; fa.bKeyDown = TRUE; fa.bRC = TRUE; @@ -679,8 +679,8 @@ void CFFL_IFormFiller::OnValidate(CPDFSDK_Widget* pWidget, ASSERT(pPageView); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); fa.bKeyDown = TRUE; fa.bRC = TRUE; @@ -747,8 +747,8 @@ void CFFL_IFormFiller::OnClick(CPDFSDK_Widget* pWidget, int nValueAge = pWidget->GetValueAge(); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnXFAAAction(PDFSDK_XFA_Click, fa, pPageView); m_bNotifying = FALSE; @@ -782,8 +782,8 @@ void CFFL_IFormFiller::OnFull(CPDFSDK_Widget* pWidget, int nValueAge = pWidget->GetValueAge(); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnXFAAAction(PDFSDK_XFA_Full, fa, pPageView); m_bNotifying = FALSE; @@ -849,8 +849,8 @@ void CFFL_IFormFiller::OnPreOpen(CPDFSDK_Widget* pWidget, int nValueAge = pWidget->GetValueAge(); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnXFAAAction(PDFSDK_XFA_PreOpen, fa, pPageView); m_bNotifying = FALSE; @@ -884,8 +884,8 @@ void CFFL_IFormFiller::OnPostOpen(CPDFSDK_Widget* pWidget, int nValueAge = pWidget->GetValueAge(); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); pWidget->OnXFAAAction(PDFSDK_XFA_PostOpen, fa, pPageView); m_bNotifying = FALSE; @@ -952,8 +952,8 @@ void CFFL_IFormFiller::OnBeforeKeyStroke(void* pPrivateData, CPDFSDK_Document* pDocument = pData->pPageView->GetSDKDocument(); PDFSDK_FieldAction fa; - fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); - fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag); + fa.bModifier = m_pApp->IsCTRLKeyDown(nFlag); + fa.bShift = m_pApp->IsSHIFTKeyDown(nFlag); fa.sChange = strChange; fa.sChangeEx = strChangeEx; fa.bKeyDown = bKeyDown; diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 842c37bbf9..f7a2740bd8 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -113,8 +113,8 @@ FX_BOOL CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, ASSERT(pPageView); m_bValid = !m_bValid; CFX_FloatRect rcAnnot = pAnnot->GetRect(); - m_pApp->FFI_Invalidate(pAnnot->GetUnderlyingPage(), rcAnnot.left, - rcAnnot.top, rcAnnot.right, rcAnnot.bottom); + m_pApp->Invalidate(pAnnot->GetUnderlyingPage(), rcAnnot.left, + rcAnnot.top, rcAnnot.right, rcAnnot.bottom); if (m_bValid) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) @@ -280,7 +280,7 @@ void CFFL_TextField::OnSetFocus(CPWL_Wnd* pWnd) { int nCharacters = wsText.GetLength(); CFX_ByteString bsUTFText = wsText.UTF16LE_Encode(); unsigned short* pBuffer = (unsigned short*)bsUTFText.c_str(); - m_pApp->FFI_OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, - nCharacters, TRUE); + m_pApp->OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, + nCharacters, TRUE); } } -- cgit v1.2.3