diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-02-04 09:32:11 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-02-04 09:32:11 -0800 |
commit | 99f20ebb09f515a6e3798b948fe66760383c9304 (patch) | |
tree | 8690b7c7b1e541e37362717232f696fa9719e78c /xfa/src/fxfa/src/parser/xfa_document_imp.cpp | |
parent | 486615821300724aef55035f4f831f548fb9cab6 (diff) | |
download | pdfium-99f20ebb09f515a6e3798b948fe66760383c9304.tar.xz |
Call CXFA_Object::ToNode() rather than C-style casting.
The static_casts<> are places where void* pointers are converted.
Fix these in a subsequent CL by using a properly typed container.
The const_casts<> are places where functions are missing "consts".
Fix these in a subsequent CL, too.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1668003003 .
Diffstat (limited to 'xfa/src/fxfa/src/parser/xfa_document_imp.cpp')
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index ed50ce4822..6b7a0350e6 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -97,8 +97,7 @@ CXFA_Object* CXFA_Document::GetXFAObject(const CFX_WideStringC& wsNodeName) { CXFA_Object* CXFA_Document::GetXFAObject(FX_DWORD dwNodeNameHash) { switch (dwNodeNameHash) { case XFA_HASHCODE_Data: { - CXFA_Node* pDatasetsNode = - (CXFA_Node*)GetXFAObject(XFA_HASHCODE_Datasets); + CXFA_Node* pDatasetsNode = ToNode(GetXFAObject(XFA_HASHCODE_Datasets)); if (!pDatasetsNode) { return NULL; } @@ -125,7 +124,7 @@ CXFA_Object* CXFA_Document::GetXFAObject(FX_DWORD dwNodeNameHash) { } return NULL; case XFA_HASHCODE_Record: { - CXFA_Node* pData = (CXFA_Node*)GetXFAObject(XFA_HASHCODE_Data); + CXFA_Node* pData = ToNode(GetXFAObject(XFA_HASHCODE_Data)); return pData ? pData->GetFirstChildByClass(XFA_ELEMENT_DataGroup) : NULL; } case XFA_HASHCODE_DataWindow: { @@ -213,7 +212,7 @@ FX_BOOL CXFA_Document::IsInteractive() { if (m_dwDocFlags & XFA_DOCFLAG_HasInteractive) { return m_dwDocFlags & XFA_DOCFLAG_Interactive; } - CXFA_Node* pConfig = (CXFA_Node*)this->GetXFAObject(XFA_HASHCODE_Config); + CXFA_Node* pConfig = ToNode(GetXFAObject(XFA_HASHCODE_Config)); if (!pConfig) { return FALSE; } @@ -240,9 +239,9 @@ FX_BOOL CXFA_Document::IsInteractive() { CXFA_LocaleMgr* CXFA_Document::GetLocalMgr() { if (!m_pLocalMgr) { CFX_WideString wsLanguage; - this->GetParser()->GetNotify()->GetAppProvider()->GetLanguage(wsLanguage); + GetParser()->GetNotify()->GetAppProvider()->GetLanguage(wsLanguage); m_pLocalMgr = new CXFA_LocaleMgr( - (CXFA_Node*)this->GetXFAObject(XFA_HASHCODE_LocaleSet), wsLanguage); + ToNode(GetXFAObject(XFA_HASHCODE_LocaleSet)), wsLanguage); } return m_pLocalMgr; } @@ -356,7 +355,7 @@ static void XFA_ProtoMerge_MergeNode(CXFA_Document* pDocument, } } void CXFA_Document::DoProtoMerge() { - CXFA_Node* pTemplateRoot = (CXFA_Node*)GetXFAObject(XFA_HASHCODE_Template); + CXFA_Node* pTemplateRoot = ToNode(GetXFAObject(XFA_HASHCODE_Template)); if (!pTemplateRoot) { return; } @@ -425,7 +424,7 @@ void CXFA_Document::DoProtoMerge() { int32_t iRet = m_pScriptContext->ResolveObjects(pUseHrefNode, wsSOM, resoveNodeRS, dwFlag); if (iRet > 0 && resoveNodeRS.nodes[0]->IsNode()) { - pProtoNode = (CXFA_Node*)resoveNodeRS.nodes[0]; + pProtoNode = resoveNodeRS.nodes[0]->AsNode(); } } else if (!wsID.IsEmpty()) { if (!mIDMap.Lookup( |