diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-09 11:46:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-09 11:46:16 -0700 |
| commit | 20d6b76d82a762e75e8c2a89976f93acd9af7467 (patch) | |
| tree | 9142c0179606d9909158678559e0adcac8b9991f /xfa/fxfa/parser | |
| parent | e64c3c60bdc1ca2e937e4317a9238ab4c210dfe5 (diff) | |
| download | pdfium-20d6b76d82a762e75e8c2a89976f93acd9af7467.tar.xz | |
Use static_cast<CXFA_WidgetAcc*> in xfa.
Remove a few other unused casts, simplify.
Review-Url: https://codereview.chromium.org/2052593003
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/xfa_layout_appadapter.h | 12 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/xfa/fxfa/parser/xfa_layout_appadapter.h b/xfa/fxfa/parser/xfa_layout_appadapter.h index be7072b704..1bae22ee32 100644 --- a/xfa/fxfa/parser/xfa_layout_appadapter.h +++ b/xfa/fxfa/parser/xfa_layout_appadapter.h @@ -14,7 +14,7 @@ class CXFA_TraverseStrategy_PageAreaContainerLayoutItem { static inline CXFA_ContainerLayoutItem* GetFirstChild( CXFA_ContainerLayoutItem* pLayoutItem) { if (pLayoutItem->m_pFormNode->GetClassID() == XFA_ELEMENT_PageSet) { - return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pFirstChild; + return static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pFirstChild); } return NULL; } @@ -24,7 +24,7 @@ class CXFA_TraverseStrategy_PageAreaContainerLayoutItem { } static inline CXFA_ContainerLayoutItem* GetParent( CXFA_ContainerLayoutItem* pLayoutItem) { - return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent; + return static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pParent); } }; class CXFA_TraverseStrategy_ContentAreaContainerLayoutItem { @@ -53,22 +53,22 @@ class CXFA_TraverseStrategy_ContentAreaContainerLayoutItem { } static inline CXFA_ContainerLayoutItem* GetParent( CXFA_ContainerLayoutItem* pLayoutItem) { - return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent; + return static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pParent); } }; class CXFA_TraverseStrategy_ContentLayoutItem { public: static inline CXFA_ContentLayoutItem* GetFirstChild( CXFA_ContentLayoutItem* pLayoutItem) { - return (CXFA_ContentLayoutItem*)pLayoutItem->m_pFirstChild; + return static_cast<CXFA_ContentLayoutItem*>(pLayoutItem->m_pFirstChild); } static inline CXFA_ContentLayoutItem* GetNextSibling( CXFA_ContentLayoutItem* pLayoutItem) { - return (CXFA_ContentLayoutItem*)pLayoutItem->m_pNextSibling; + return static_cast<CXFA_ContentLayoutItem*>(pLayoutItem->m_pNextSibling); } static inline CXFA_ContentLayoutItem* GetParent( CXFA_ContentLayoutItem* pLayoutItem) { - return (CXFA_ContentLayoutItem*)pLayoutItem->m_pParent; + return static_cast<CXFA_ContentLayoutItem*>(pLayoutItem->m_pParent); } }; diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp index 4ec6c14dfd..37c64b6b05 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp @@ -211,8 +211,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray( const CFX_WideString& wsType, FX_BOOL bOnPageArea, CXFA_NodeArray& retArray) { - CXFA_ContainerLayoutItem* pLayoutPage = - (CXFA_ContainerLayoutItem*)pDocLayout->GetPage(iPageNo); + CXFA_ContainerLayoutItem* pLayoutPage = pDocLayout->GetPage(iPageNo); if (!pLayoutPage) { return; } |