summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r--xfa/fxfa/app/cxfa_eventparam.cpp4
-rw-r--r--xfa/fxfa/app/xfa_ffdocview.cpp28
2 files changed, 8 insertions, 24 deletions
diff --git a/xfa/fxfa/app/cxfa_eventparam.cpp b/xfa/fxfa/app/cxfa_eventparam.cpp
index bcce7219bc..bd6742f4dd 100644
--- a/xfa/fxfa/app/cxfa_eventparam.cpp
+++ b/xfa/fxfa/app/cxfa_eventparam.cpp
@@ -19,8 +19,7 @@ CXFA_EventParam::CXFA_EventParam()
m_iSelEnd(0),
m_iSelStart(0),
m_bShift(false),
- m_bIsFormReady(false),
- m_iValidateActivities(XFA_VALIDATE_preSubmit) {}
+ m_bIsFormReady(false) {}
CXFA_EventParam::~CXFA_EventParam() {}
@@ -44,5 +43,4 @@ void CXFA_EventParam::Reset() {
m_wsSoapFaultCode.clear();
m_wsSoapFaultString.clear();
m_bIsFormReady = false;
- m_iValidateActivities = XFA_VALIDATE_preSubmit;
}
diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp
index 210002c530..b2ed1e907c 100644
--- a/xfa/fxfa/app/xfa_ffdocview.cpp
+++ b/xfa/fxfa/app/xfa_ffdocview.cpp
@@ -274,42 +274,28 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam,
? pPresentNode->GetChild(0, XFA_Element::Validate)
: nullptr;
}
- if (pValidateNode) {
+ if (pValidateNode)
wsValidateStr = pValidateNode->GetContent();
- }
- }
- bool bValidate = false;
- switch (pParam->m_iValidateActivities) {
- case XFA_VALIDATE_preSubmit:
- bValidate = wsValidateStr.Find(L"preSubmit") != -1;
- break;
- case XFA_VALIDATE_prePrint:
- bValidate = wsValidateStr.Find(L"prePrint") != -1;
- break;
- case XFA_VALIDATE_preExecute:
- bValidate = wsValidateStr.Find(L"preExecute") != -1;
- break;
- case XFA_VALIDATE_preSave:
- bValidate = wsValidateStr.Find(L"preSave") != -1;
- break;
}
- if (!bValidate) {
+
+ if (wsValidateStr.Find(L"preSubmit") == -1)
return XFA_EVENTERROR_Success;
- }
}
+
CXFA_Node* pNode = pWidgetAcc ? pWidgetAcc->GetNode() : nullptr;
if (!pNode) {
CXFA_Node* pRootItem =
ToNode(m_pDoc->GetXFADoc()->GetXFAObject(XFA_HASHCODE_Form));
- if (!pRootItem) {
+ if (!pRootItem)
return XFA_EVENTERROR_Error;
- }
+
pNode = pRootItem->GetChild(0, XFA_Element::Subform);
}
ExecEventActivityByDeepFirst(pNode, pParam->m_eType, pParam->m_bIsFormReady,
true, nullptr);
return XFA_EVENTERROR_Success;
}
+
CXFA_FFWidgetHandler* CXFA_FFDocView::GetWidgetHandler() {
if (!m_pWidgetHandler)
m_pWidgetHandler = pdfium::MakeUnique<CXFA_FFWidgetHandler>(this);