From a5ab26b8aa9ed12af8bdf323cb297f61cbfeb1fa Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 22 Jun 2016 21:09:12 -0700 Subject: Remove unused GetScriptObjHash(). Method is never called, remove it and the data variable it uses as it will no longer be used. Review-Url: https://codereview.chromium.org/2088173003 --- xfa/fxfa/parser/xfa_object.h | 2 -- xfa/fxfa/parser/xfa_object_imp.cpp | 6 +----- xfa/fxfa/parser/xfa_script_datawindow.cpp | 1 - xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp | 1 - xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp | 1 - xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp | 1 - xfa/fxfa/parser/xfa_script_logpseudomodel.cpp | 1 - xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp | 1 - 8 files changed, 1 insertion(+), 13 deletions(-) diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index aac4839936..4da2f1045b 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -689,11 +689,9 @@ class CXFA_OrdinaryObject : public CXFA_Object { ~CXFA_OrdinaryObject() override; XFA_Element GetClassID() const; - uint32_t GetScriptObjHash() const; protected: XFA_Element m_eNodeClass; - uint32_t m_uScriptHash; }; class CXFA_ThisProxy : public CXFA_Object { diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp index c4dd9413cc..d71956bed5 100644 --- a/xfa/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/fxfa/parser/xfa_object_imp.cpp @@ -5082,7 +5082,7 @@ void CXFA_Node::MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_OrdinaryObject::CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_Element eElement) - : CXFA_Object(pDocument, XFA_ObjectType::OrdinaryObject), m_uScriptHash(0) { + : CXFA_Object(pDocument, XFA_ObjectType::OrdinaryObject) { m_eNodeClass = eElement; } @@ -5092,10 +5092,6 @@ XFA_Element CXFA_OrdinaryObject::GetClassID() const { return m_eNodeClass; } -uint32_t CXFA_OrdinaryObject::GetScriptObjHash() const { - return m_uScriptHash; -} - CXFA_ThisProxy::CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode) : CXFA_Object(pThisNode->GetDocument(), XFA_ObjectType::VariablesThis), m_pThisNode(NULL), diff --git a/xfa/fxfa/parser/xfa_script_datawindow.cpp b/xfa/fxfa/parser/xfa_script_datawindow.cpp index 8bf1520ca9..79f3219214 100644 --- a/xfa/fxfa/parser/xfa_script_datawindow.cpp +++ b/xfa/fxfa/parser/xfa_script_datawindow.cpp @@ -17,7 +17,6 @@ CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::DataWindow) { - m_uScriptHash = XFA_HASHCODE_DataWindow; } CScript_DataWindow::~CScript_DataWindow() {} void CScript_DataWindow::Script_DataWindow_MoveCurrentRecord( diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp index 7277240f43..b9407d0f86 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp @@ -22,7 +22,6 @@ CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::EventPseudoModel) { - m_uScriptHash = XFA_HASHCODE_Event; } CScript_EventPseudoModel::~CScript_EventPseudoModel() {} void Script_EventPseudoModel_StringProperty(CFXJSE_Value* pValue, diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp index e4ba480dce..aabdf95cb5 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp @@ -29,7 +29,6 @@ CXFA_Node* ToNode(CFXJSE_Value* pValue, CFXJSE_Class* pClass) { CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::HostPseudoModel) { - m_uScriptHash = XFA_HASHCODE_Host; } CScript_HostPseudoModel::~CScript_HostPseudoModel() {} void CScript_HostPseudoModel::Script_HostPseudoModel_LoadString( diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp index 3617b6487e..39ca8028df 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp @@ -25,7 +25,6 @@ CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::LayoutPseudoModel) { - m_uScriptHash = XFA_HASHCODE_Layout; } CScript_LayoutPseudoModel::~CScript_LayoutPseudoModel() {} void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Ready( diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp index bd404b83dd..002a42769c 100644 --- a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp @@ -17,7 +17,6 @@ CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::LogPseudoModel) { - m_uScriptHash = XFA_HASHCODE_Log; } CScript_LogPseudoModel::~CScript_LogPseudoModel() {} void CScript_LogPseudoModel::Script_LogPseudoModel_Message( diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp index a528d5c18f..9befa177f4 100644 --- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp @@ -21,7 +21,6 @@ CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_Element::SignaturePseudoModel) { - m_uScriptHash = XFA_HASHCODE_Signature; } CScript_SignaturePseudoModel::~CScript_SignaturePseudoModel() {} void CScript_SignaturePseudoModel::Script_SignaturePseudoModel_Verify( -- cgit v1.2.3