summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h2
-rw-r--r--fpdfsdk/include/fsdk_mgr.h1
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp12
-rw-r--r--xfa/include/fwl/basewidget/fwl_edit.h7
-rw-r--r--xfa/include/fxfa/fxfa.h1
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_editimp.cpp10
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffchoicelist.h1
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftextedit.cpp8
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftextedit.h1
10 files changed, 9 insertions, 38 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index abe22a7be7..14b07c3059 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -141,7 +141,7 @@ class CPDFXFA_Document : public IXFA_DocProvider {
// Get document path
virtual void GetURL(IXFA_Doc* hDoc, CFX_WideString& wsDocURL);
virtual FX_ARGB GetHighlightColor(IXFA_Doc* hDoc);
- virtual void AddDoRecord(IXFA_Widget* hWidget);
+
/**
*Submit data to email, http, ftp.
* @param[in] hDoc The document handler.
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index cd5db5440f..d686a460cc 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -277,7 +277,6 @@ class CPDFDoc_Environment final {
wsURL = CFX_WideString();
}
- void FFI_AddDoRecord(FPDF_DOCUMENT document, FPDF_WIDGET hWidget) {}
void FFI_PageEvent(FPDF_PAGE page, FPDF_DWORD flag) {}
void FFI_GetPageViewRect(FPDF_PAGE page, FS_RECTF& dstRect) {
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index dbd3bd0bad..09c444eb67 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -804,19 +804,11 @@ FX_ARGB CPDFXFA_Document::GetHighlightColor(IXFA_Doc* hDoc) {
return 0;
}
-void CPDFXFA_Document::AddDoRecord(IXFA_Widget* hWidget) {
- CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
- if (pEnv == NULL)
- return;
- return;
- // pEnv->FFI_AddDoRecord(this, hWidget);
-}
-
FX_BOOL CPDFXFA_Document::_NotifySubmit(FX_BOOL bPrevOrPost) {
if (bPrevOrPost)
return _OnBeforeNotifySumbit();
- else
- _OnAfterNotifySumbit();
+
+ _OnAfterNotifySumbit();
return TRUE;
}
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index 4a913e873d..b92c20f00d 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -60,8 +60,7 @@ enum FWL_EDT_TEXTCHANGED {
FWL_EDT_TEXTCHANGED_Delete,
FWL_EDT_TEXTCHANGED_Replace,
};
-#define FWL_EVT_EDT_AddDoRecord L"FWL_EVENT_EDT_AddDoRecord"
-#define FWL_EVTHASH_EDT_AddDoRecord 3701672224
+
#define FWL_EVT_EDT_TextChanged L"FWL_EVENT_EDT_TextChanged"
#define FWL_EVTHASH_EDT_TextChanged 1064022132
#define FWL_EVT_EDT_PreSelfAdaption L"FWL_EVENT_PreSelfAdaption"
@@ -74,9 +73,7 @@ enum FWL_EDT_TEXTCHANGED {
#define FWL_EVTHASH_EDT_GetSuggestWords 315782791
#define FWL_EVT_EDT_TextFull L"FWL_EVTHASH_EDT_TextFull"
#define FWL_EVTHASH_EDT_TextFull 2158580174
-BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtAddDoRecord, FWL_EVTHASH_EDT_AddDoRecord)
-CFX_ByteString m_wsDoRecord;
-END_FWL_EVENT_DEF
+
BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, FWL_EVTHASH_EDT_TextChanged)
int32_t nChangeType;
CFX_WideString wsInsert;
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 5c0f63619e..5fbd829c4e 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -437,7 +437,6 @@ class IXFA_DocProvider {
}
virtual void GetURL(IXFA_Doc* hDoc, CFX_WideString& wsDocURL) = 0;
virtual FX_ARGB GetHighlightColor(IXFA_Doc* hDoc) = 0;
- virtual void AddDoRecord(IXFA_Widget* hWidget) = 0;
virtual FX_BOOL SubmitData(IXFA_Doc* hDoc, CXFA_Submit submit) = 0;
virtual FX_BOOL CheckWord(IXFA_Doc* hDoc, const CFX_ByteStringC& sWord) = 0;
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 5957bb3b02..45b94d13b0 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -931,18 +931,12 @@ FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine* pEdit,
pPage->UnloadPage();
return TRUE;
}
+
void CFWL_EditImp::On_AddDoRecord(IFDE_TxtEdtEngine* pEdit,
const CFX_ByteStringC& bsDoRecord) {
AddDoRecord(bsDoRecord);
- CFWL_WidgetImp* pSrcTarget = GetRootOuter();
- if (!pSrcTarget) {
- pSrcTarget = this;
- }
- CFWL_EvtEdtAddDoRecord evt;
- evt.m_pSrcTarget = m_pInterface;
- evt.m_wsDoRecord = bsDoRecord;
- m_pDelegate->OnProcessEvent(&evt);
}
+
FX_BOOL CFWL_EditImp::On_ValidateField(IFDE_TxtEdtEngine* pEdit,
int32_t nBlockIndex,
int32_t nFieldIndex,
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
index 6459dc72a3..270ea86174 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
@@ -501,9 +501,7 @@ void CXFA_FFComboBox::OnPostOpen(IFWL_Widget* pWidget) {
eParam.m_pTarget = m_pDataAcc;
m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_PostOpen, &eParam);
}
-void CXFA_FFComboBox::OnAddDoRecord(IFWL_Widget* pWidget) {
- GetDoc()->GetDocProvider()->AddDoRecord(this);
-}
+
int32_t CXFA_FFComboBox::OnProcessMessage(CFWL_Message* pMessage) {
return m_pOldDelegate->OnProcessMessage(pMessage);
}
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
index 0093240ebb..b8140b33d5 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
@@ -77,7 +77,6 @@ class CXFA_FFComboBox : public CXFA_FFField {
FX_BOOL bLButtonUp);
void OnPreOpen(IFWL_Widget* pWidget);
void OnPostOpen(IFWL_Widget* pWidget);
- void OnAddDoRecord(IFWL_Widget* pWidget);
void SetItemState(int32_t nIndex, FX_BOOL bSelected);
void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);
void DeleteItem(int32_t nIndex);
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index 95adb64846..083769866c 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -370,9 +370,7 @@ void CXFA_FFTextEdit::OnTextFull(IFWL_Widget* pWidget) {
eParam.m_pTarget = m_pDataAcc;
m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Full, &eParam);
}
-void CXFA_FFTextEdit::OnAddDoRecord(IFWL_Widget* pWidget) {
- GetDoc()->GetDocProvider()->AddDoRecord(this);
-}
+
FX_BOOL CXFA_FFTextEdit::CheckWord(const CFX_ByteStringC& sWord) {
if (sWord.IsEmpty() || m_pDataAcc->GetUIType() != XFA_ELEMENT_TextEdit) {
return TRUE;
@@ -399,10 +397,6 @@ FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
OnTextChanged(m_pNormalWidget->GetWidget(), wsChange, event->wsPrevText);
break;
}
- case FWL_EVTHASH_EDT_AddDoRecord: {
- OnAddDoRecord(m_pNormalWidget->GetWidget());
- break;
- }
case FWL_EVTHASH_EDT_TextFull: {
OnTextFull(m_pNormalWidget->GetWidget());
break;
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h
index 664aa5edc4..9694b49f40 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.h
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h
@@ -48,7 +48,6 @@ class CXFA_FFTextEdit : public CXFA_FFField {
const CFX_WideString& wsChanged,
const CFX_WideString& wsPrevText);
void OnTextFull(IFWL_Widget* pWidget);
- void OnAddDoRecord(IFWL_Widget* pWidget);
FX_BOOL CheckWord(const CFX_ByteStringC& sWord);
FX_BOOL GetSuggestWords(const CFX_ByteStringC& sWord,
CFX_ByteStringArray& sSuggest);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:35:12 +0000