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 f5b09205486d63ef61cd2894533ce543b32f10dc..fb024ab8dbff0bb4199b76a7b333d037abcb5f05 100644 |
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp |
@@ -18,7 +18,6 @@ |
#include "xfa/fxfa/parser/xfa_layout_pagemgr_new.h" |
#include "xfa/fxfa/parser/xfa_localemgr.h" |
#include "xfa/fxfa/parser/xfa_object.h" |
-#include "xfa/fxfa/parser/xfa_parser.h" |
#include "xfa/fxfa/parser/xfa_parser_imp.h" |
#include "xfa/fxfa/parser/xfa_script.h" |
#include "xfa/fxfa/parser/xfa_utils.h" |
@@ -92,7 +91,6 @@ CXFA_ContentLayoutItem* CXFA_ItemLayoutProcessor::CreateContentLayoutItem( |
return pLayoutItem; |
} |
pLayoutItem = (CXFA_ContentLayoutItem*)pFormNode->GetDocument() |
- ->GetParser() |
->GetNotify() |
->OnCreateLayoutItem(pFormNode); |
CXFA_ContentLayoutItem* pPrevLayoutItem = |
@@ -122,7 +120,7 @@ FX_BOOL CXFA_ItemLayoutProcessor::FindLayoutItemSplitPos( |
case XFA_ATTRIBUTEENUM_None: { |
FX_BOOL bAnyChanged = FALSE; |
CXFA_Document* pDocument = pFormNode->GetDocument(); |
- CXFA_FFNotify* pNotify = pDocument->GetParser()->GetNotify(); |
+ CXFA_FFNotify* pNotify = pDocument->GetNotify(); |
FX_FLOAT fCurTopMargin = 0, fCurBottomMargin = 0; |
CXFA_Node* pMarginNode = |
pFormNode->GetFirstChildByClass(XFA_Element::Margin); |
@@ -585,7 +583,7 @@ CXFA_ContentLayoutItem* CXFA_ItemLayoutProcessor::ExtractLayoutItem() { |
if (m_pOldLayoutItem->m_pPrev) |
m_pOldLayoutItem->m_pPrev->m_pNext = nullptr; |
CXFA_FFNotify* pNotify = |
- m_pOldLayoutItem->m_pFormNode->GetDocument()->GetParser()->GetNotify(); |
+ m_pOldLayoutItem->m_pFormNode->GetDocument()->GetNotify(); |
CXFA_LayoutProcessor* pDocLayout = |
m_pOldLayoutItem->m_pFormNode->GetDocument()->GetDocLayout(); |
CXFA_ContentLayoutItem* pOldLayoutItem = m_pOldLayoutItem; |
@@ -647,8 +645,7 @@ static FX_BOOL XFA_ItemLayoutProcessor_FindBreakNode( |
return bFindRs; |
} |
static void XFA_DeleteLayoutGeneratedNode(CXFA_Node* pGenerateNode) { |
- CXFA_FFNotify* pNotify = |
- pGenerateNode->GetDocument()->GetParser()->GetNotify(); |
+ CXFA_FFNotify* pNotify = pGenerateNode->GetDocument()->GetNotify(); |
CXFA_LayoutProcessor* pDocLayout = |
pGenerateNode->GetDocument()->GetDocLayout(); |
CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFANode> sIterator( |
@@ -1233,8 +1230,8 @@ static inline void XFA_ItemLayoutProcessor_UpdateWidgetSize( |
} |
case XFA_Element::Draw: |
case XFA_Element::Field: { |
- pNode->GetDocument()->GetParser()->GetNotify()->StartFieldDrawLayout( |
- pNode, fWidth, fHeight); |
+ pNode->GetDocument()->GetNotify()->StartFieldDrawLayout(pNode, fWidth, |
+ fHeight); |
break; |
} |
default: |
@@ -2896,7 +2893,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutField() { |
return; |
} |
CXFA_Document* pDocument = m_pFormNode->GetDocument(); |
- CXFA_FFNotify* pNotify = pDocument->GetParser()->GetNotify(); |
+ CXFA_FFNotify* pNotify = pDocument->GetNotify(); |
FX_FLOAT fHeight = -1; |
FX_FLOAT fWidth = -1; |
pNotify->StartFieldDrawLayout(m_pFormNode, fWidth, fHeight); |