diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-07-19 10:27:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-19 10:27:12 -0700 |
| commit | eea31b75a11215aa72a9845d47c38d2ce1edd4f7 (patch) | |
| tree | f6ef06a0c323a0a842981da595144fc8d2085d86 /xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp | |
| parent | 3617751cea45fd636d58f535a662337fcea40c4a (diff) | |
| download | pdfium-chromium/2803.tar.xz | |
Cleanup CXFA_Documentchromium/2803chromium/2802
Removing unused XFA_LAYOUTRESULT, cleanup unused parameters, convert XFA_DocFlag
to an enum from defines and make the constructor explicit.
Review-Url: https://codereview.chromium.org/2166433002
Diffstat (limited to 'xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp index 5055000a6b..7ddb759363 100644 --- a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp @@ -849,7 +849,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessBreakBeforeOrAfter( pDataScope = XFA_DataMerge_FindDataScope(pFormNode); } pBreakLeaderNode = pDocument->DataMerge_CopyContainer( - pLeaderTemplate, pFormNode, pDataScope, TRUE); + pLeaderTemplate, pFormNode, pDataScope, TRUE, TRUE, TRUE); pDocument->DataMerge_UpdateBindingRelations(pBreakLeaderNode); SetLayoutGeneratedNodeFlag(pBreakLeaderNode); } @@ -858,7 +858,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessBreakBeforeOrAfter( pDataScope = XFA_DataMerge_FindDataScope(pFormNode); } pBreakTrailerNode = pDocument->DataMerge_CopyContainer( - pTrailerTemplate, pFormNode, pDataScope, TRUE); + pTrailerTemplate, pFormNode, pDataScope, TRUE, TRUE, TRUE); pDocument->DataMerge_UpdateBindingRelations(pBreakTrailerNode); SetLayoutGeneratedNodeFlag(pBreakTrailerNode); } @@ -881,7 +881,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessBookendLeaderOrTrailer( pDataScope = XFA_DataMerge_FindDataScope(pFormNode); } pBookendAppendNode = pDocument->DataMerge_CopyContainer( - pLeaderTemplate, pFormNode, pDataScope, TRUE); + pLeaderTemplate, pFormNode, pDataScope, TRUE, TRUE, TRUE); pDocument->DataMerge_UpdateBindingRelations(pBookendAppendNode); SetLayoutGeneratedNodeFlag(pBookendAppendNode); return TRUE; @@ -1003,7 +1003,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode, pDataScope = XFA_DataMerge_FindDataScope(pFormNode); } pLeaderNode = pDocument->DataMerge_CopyContainer( - pLeaderTemplate, pFormNode, pDataScope, TRUE); + pLeaderTemplate, pFormNode, pDataScope, TRUE, TRUE, TRUE); pDocument->DataMerge_UpdateBindingRelations(pLeaderNode); SetLayoutGeneratedNodeFlag(pLeaderNode); } @@ -1012,7 +1012,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode, pDataScope = XFA_DataMerge_FindDataScope(pFormNode); } pTrailerNode = pDocument->DataMerge_CopyContainer( - pTrailerTemplate, pFormNode, pDataScope, TRUE); + pTrailerTemplate, pFormNode, pDataScope, TRUE, TRUE, TRUE); pDocument->DataMerge_UpdateBindingRelations(pTrailerNode); SetLayoutGeneratedNodeFlag(pTrailerNode); } @@ -1742,7 +1742,8 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { } pContainerItem->m_pFormNode = pDocument->DataMerge_CopyContainer( pContainerItem->m_pFormNode, pParentNode, - ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Record)), TRUE); + ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Record)), TRUE, TRUE, + TRUE); } break; case XFA_Element::ContentArea: { CXFA_Node* pParentNode = pContainerItem->m_pParent->m_pFormNode; |