| Index: xfa/fxfa/app/xfa_ffnotify.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp
|
| index ac4cc27f8d4672465a1fde85bba61665091d2eef..4f555f30f56c709f43ab84aadbe172900ae23357 100644
|
| --- a/xfa/fxfa/app/xfa_ffnotify.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffnotify.cpp
|
| @@ -88,8 +88,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
|
| if (!pWidget) {
|
| if (bStaticNotify) {
|
| pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
|
| - pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded, pParam,
|
| - pAdditional);
|
| + pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded);
|
| }
|
| return;
|
| }
|
| @@ -107,8 +106,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
|
| }
|
| if (bStaticNotify) {
|
| pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
|
| - pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded, pParam,
|
| - pAdditional);
|
| + pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded);
|
| }
|
| pWidget = pWidgetAcc->GetNextWidget(pWidget);
|
| }
|
| @@ -122,8 +120,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
|
| if (!pWidget) {
|
| if (bStaticNotify) {
|
| pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
|
| - pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved, pParam,
|
| - pAdditional);
|
| + pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved);
|
| }
|
| return;
|
| }
|
| @@ -139,8 +136,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
|
| }
|
| if (bStaticNotify) {
|
| pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
|
| - pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved, pParam,
|
| - pAdditional);
|
| + pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved);
|
| }
|
| pWidget = pWidgetAcc->GetNextWidget(pWidget);
|
| }
|
| @@ -494,18 +490,12 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
|
| default:
|
| break;
|
| }
|
| - if (bIsContainerNode && eAttr == XFA_ATTRIBUTE_Access) {
|
| + if (bIsContainerNode && eAttr == XFA_ATTRIBUTE_Access)
|
| bUpdateProperty = TRUE;
|
| - FX_BOOL bNotify = pDocView->IsStaticNotify();
|
| - if (bNotify) {
|
| - pWidgetAcc->NotifyEvent(XFA_WIDGETEVENT_AccessChanged, NULL, pParam2,
|
| - NULL);
|
| - }
|
| - }
|
| +
|
| if (eAttr == XFA_ATTRIBUTE_Value) {
|
| pDocView->AddCalculateNodeNotify(pSender);
|
| if (ePType == XFA_ELEMENT_Value || bIsContainerNode) {
|
| - FX_BOOL bNotify = pDocView->IsStaticNotify();
|
| if (bIsContainerNode) {
|
| pWidgetAcc->UpdateUIDisplay();
|
| pDocView->AddCalculateWidgetAcc(pWidgetAcc);
|
| @@ -514,10 +504,6 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
|
| ->GetClassID() == XFA_ELEMENT_ExclGroup) {
|
| pWidgetAcc->UpdateUIDisplay();
|
| }
|
| - if (bNotify) {
|
| - pWidgetAcc->NotifyEvent(XFA_WIDGETEVENT_PostContentChanged, NULL,
|
| - NULL, NULL);
|
| - }
|
| return;
|
| }
|
| }
|
| @@ -585,8 +571,7 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
|
| (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) {
|
| pWidget->SetPageView(pNewPageView);
|
| m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
|
| - XFA_WIDGETEVENT_PostAdded,
|
| - pNewPageView, pPrePageView);
|
| + XFA_WIDGETEVENT_PostAdded);
|
| }
|
| if (pDocView->GetLayoutStatus() != XFA_DOCVIEW_LAYOUTSTATUS_End ||
|
| !(dwStatus & XFA_WIDGETSTATUS_Visible)) {
|
| @@ -610,8 +595,7 @@ void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView,
|
| CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
|
| pDocView->DeleteLayoutItem(pWidget);
|
| m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
|
| - XFA_WIDGETEVENT_PreRemoved, nullptr,
|
| - pWidget->GetPageView());
|
| + XFA_WIDGETEVENT_PreRemoved);
|
| pWidget->AddInvalidateRect(nullptr);
|
| }
|
| void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView,
|
|
|