From 5548984944785d80daa03d98e92698309a3bc604 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 13 Dec 2017 01:19:24 +0000 Subject: Move Script_Som_* methods to CJX_Object The CJX_Node isn't the root of the CJX hierarchy. This causes issues now that CJX_Object has child objects which don't inherit from CJX_Node. This CL moves Script_Som_* from CJX_Node to CJX_Object. Change-Id: Iacb21758d9bf83f148044af225c710ad7d8521d2 Reviewed-on: https://pdfium-review.googlesource.com/20993 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_node.h | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'fxjs/xfa/cjx_node.h') diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h index 3d8f4dff01..f2ff49217e 100644 --- a/fxjs/xfa/cjx_node.h +++ b/fxjs/xfa/cjx_node.h @@ -28,18 +28,6 @@ class CJX_Node : public CJX_Tree { CXFA_Node* GetXFANode(); const CXFA_Node* GetXFANode() const; - CXFA_Node* GetProperty(int32_t index, - XFA_Element eType, - bool bCreateProperty); - - pdfium::Optional TryContent(bool bScriptModify, bool bProto); - bool SetContent(const WideString& wsContent, - const WideString& wsXMLValue, - bool bNotify, - bool bScriptModify, - bool bSyncData); - WideString GetContent(bool bScriptModify); - void SetLayoutItem(CXFA_LayoutItem* item) { layout_item_ = item; } CXFA_LayoutItem* GetLayoutItem() const { return layout_item_.Get(); } @@ -52,7 +40,6 @@ class CJX_Node : public CJX_Tree { const WideString& prop) const; void ThrowTooManyOccurancesException(const WideString& obj) const; - int32_t Subform_and_SubformSet_InstanceIndex(); int32_t InstanceManager_SetInstances(int32_t iDesired); int32_t InstanceManager_MoveInstance(int32_t iTo, int32_t iFrom); @@ -101,30 +88,6 @@ class CJX_Node : public CJX_Tree { void Script_Field_Length(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); - void Script_Som_DefaultValue(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Som_DefaultValue_Read(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Boolean_Value(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Som_DataNode(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Som_Mandatory(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Som_InstanceIndex(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Draw_DefaultValue(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Field_DefaultValue(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); void Script_Field_EditValue(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); -- cgit v1.2.3