Index: xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
index 6553dc07cc563b69e2c120370f84e7a4eac1a8bd..17f97da7792eb89c10349e4d285569c5b7aef8db 100644 |
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
@@ -561,8 +561,7 @@ CXFA_ContentLayoutItem* CXFA_ItemLayoutProcessor::ExtractLayoutItem() { |
CXFA_ContentLayoutItem* pOldLayoutItem = m_pOldLayoutItem; |
while (pOldLayoutItem) { |
CXFA_ContentLayoutItem* pNextOldLayoutItem = pOldLayoutItem->m_pNext; |
- pNotify->OnLayoutEvent(pDocLayout, pOldLayoutItem, |
- XFA_LAYOUTEVENT_ItemRemoving); |
+ pNotify->OnLayoutItemRemoving(pDocLayout, pOldLayoutItem); |
delete pOldLayoutItem; |
pOldLayoutItem = pNextOldLayoutItem; |
} |
@@ -630,8 +629,7 @@ static void XFA_DeleteLayoutGeneratedNode(CXFA_Node* pGenerateNode) { |
CXFA_ContentLayoutItem* pNextLayoutItem = NULL; |
while (pCurLayoutItem) { |
pNextLayoutItem = pCurLayoutItem->m_pNext; |
- pNotify->OnLayoutEvent(pDocLayout, pCurLayoutItem, |
- XFA_LAYOUTEVENT_ItemRemoving); |
+ pNotify->OnLayoutItemRemoving(pDocLayout, pCurLayoutItem); |
delete pCurLayoutItem; |
pCurLayoutItem = pNextLayoutItem; |
} |
@@ -1868,7 +1866,7 @@ void CXFA_ItemLayoutProcessor::ProcessUnUseBinds(CXFA_Node* pFormNode) { |
pNode->SetObject(XFA_ATTRIBUTE_BindingNode, NULL); |
} |
} |
- pNode->SetFlag(XFA_NODEFLAG_UnusedNode); |
+ pNode->SetFlag(XFA_NODEFLAG_UnusedNode, true); |
} |
} |
void CXFA_ItemLayoutProcessor::ProcessUnUseOverFlow( |