summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa/src/common/xfa_document.h
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fxfa/src/common/xfa_document.h')
-rw-r--r--xfa/src/fxfa/src/common/xfa_document.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index fe19ea06a6..e9b3f59e47 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -154,7 +154,6 @@ class CXFA_Document : public IXFA_ObjFactory {
XFA_ELEMENT eElement);
void DoProtoMerge();
CXFA_Node* GetNodeByID(CXFA_Node* pRoot, const CFX_WideStringC& wsID);
-
void DoDataMerge();
void DoDataRemerge(FX_BOOL bDoDataMerge);
CXFA_Node* DataMerge_CopyContainer(CXFA_Node* pTemplateNode,
@@ -171,7 +170,6 @@ class CXFA_Document : public IXFA_ObjFactory {
IXFA_ScriptContext* GetScriptContext();
void ClearLayoutData();
- public:
CFX_MapPtrTemplate<FX_DWORD, CXFA_Node*> m_rgGlobalBinding;
CXFA_NodeArray m_pPendingPageSet;
@@ -180,7 +178,6 @@ class CXFA_Document : public IXFA_ObjFactory {
IXFA_ScriptContext* m_pScriptContext;
CXFA_LayoutProcessor* m_pLayoutProcessor;
CXFA_Node* m_pRootNode;
-
CXFA_LocaleMgr* m_pLocalMgr;
CScript_DataWindow* m_pScriptDataWindow;
CScript_EventPseudoModel* m_pScriptEvent;