XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/app/xfa_ffnotify.cpp

Index: xfa/fxfa/app/xfa_ffnotify.cpp
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp
index b6e64d04b763932505573571b88bc299ca979b6d..07e6a4835ccf67ca39aeb57fc1205825f681ea15 100644
--- a/xfa/fxfa/app/xfa_ffnotify.cpp
+++ b/xfa/fxfa/app/xfa_ffnotify.cpp
@@ -473,19 +473,19 @@ void CXFA_FFNotify::OnLayoutItemAdded(CXFA_LayoutProcessor* pLayout,
     return;
 
   CXFA_FFPageView* pNewPageView = pDocView->GetPageView(iPageIdx);
-  uint32_t dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
-                      XFA_WIDGETSTATUS_Printable;
+  uint32_t dwFilter = XFA_WidgetStatus_Visible | XFA_WidgetStatus_Viewable |
+                      XFA_WidgetStatus_Printable;
   pWidget->ModifyStatus(dwStatus, dwFilter);
   CXFA_FFPageView* pPrePageView = pWidget->GetPageView();
   if (pPrePageView != pNewPageView ||
-      (dwStatus & (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) ==
-          (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) {
+      (dwStatus & (XFA_WidgetStatus_Visible | XFA_WidgetStatus_Viewable)) ==
+          (XFA_WidgetStatus_Visible | XFA_WidgetStatus_Viewable)) {
     pWidget->SetPageView(pNewPageView);
     m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
                                           XFA_WIDGETEVENT_PostAdded);
   }
   if (pDocView->GetLayoutStatus() != XFA_DOCVIEW_LAYOUTSTATUS_End ||
-      !(dwStatus & XFA_WIDGETSTATUS_Visible)) {
+      !(dwStatus & XFA_WidgetStatus_Visible)) {
     return;
   }
   if (pWidget->IsLoaded()) {