xfa/fxfa/parser/xfa_document_datamerger_imp.h - Issue 2122373003: Cleanup xfa_document_datamerge files

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fxfa/parser/xfa_document_datamerger_imp.h

Issue 2122373003: Cleanup xfa_document_datamerge files (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Add else Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: xfa/fxfa/parser/xfa_document_datamerger_imp.h

diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.h b/xfa/fxfa/parser/xfa_document_datamerger_imp.h

index a31bb3fd155ab6063fe057629b3bf062aec95842..f97a7b43b9018bdb2368ad577ca939594f08fafb 100644

--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.h

+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.h

@@ -9,12 +9,11 @@

#include "xfa/fxfa/parser/xfa_object.h"

-CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(

- CXFA_Document* pDocument,

- CXFA_Node* pFormParent,

- CXFA_Node* pTemplateNode,

- FX_BOOL bRecursive,

- CXFA_NodeArray* pSubformArray = nullptr);

+CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(CXFA_Document* pDocument,

+ CXFA_Node* pFormParent,

+ CXFA_Node* pTemplateNode,

+ FX_BOOL bRecursive,

+ CXFA_NodeArray* pSubformArray);

CXFA_Node* XFA_DataMerge_FindDataScope(CXFA_Node* pParentFormNode);

CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,

XFA_Element eType,