From 77b909e059283c1d4c1654a626fc05c584af11a3 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Thu, 9 Jun 2016 14:08:11 -0700
Subject: Remove more casts, part 7.

Replacing a void* member in CFX_SAXItem saves lots of casts.

Review-Url: https://codereview.chromium.org/2051233002
---
 xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp')

diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
index bac3c18514..67416f2166 100644
--- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
@@ -242,7 +242,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray(
         if (!bOnPageArea) {
           CXFA_NodeIteratorTemplate<CXFA_ContentLayoutItem,
                                     CXFA_TraverseStrategy_ContentLayoutItem>
-          iterator((CXFA_ContentLayoutItem*)pItem->m_pFirstChild);
+          iterator(static_cast<CXFA_ContentLayoutItem*>(pItem->m_pFirstChild));
           for (CXFA_ContentLayoutItem* pItemChild = iterator.GetCurrent();
                pItemChild; pItemChild = iterator.MoveToNext()) {
             if (!pItemChild->IsContentLayoutItem()) {
@@ -266,7 +266,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray(
         if (bOnPageArea) {
           CXFA_NodeIteratorTemplate<CXFA_ContentLayoutItem,
                                     CXFA_TraverseStrategy_ContentLayoutItem>
-          iterator((CXFA_ContentLayoutItem*)pItem);
+          iterator(static_cast<CXFA_ContentLayoutItem*>(pItem));
           for (CXFA_ContentLayoutItem* pItemChild = iterator.GetCurrent();
                pItemChild; pItemChild = iterator.MoveToNext()) {
             if (!pItemChild->IsContentLayoutItem()) {
@@ -306,7 +306,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray(
         if (!bOnPageArea) {
           CXFA_NodeIteratorTemplate<CXFA_ContentLayoutItem,
                                     CXFA_TraverseStrategy_ContentLayoutItem>
-          iterator((CXFA_ContentLayoutItem*)pItem->m_pFirstChild);
+          iterator(static_cast<CXFA_ContentLayoutItem*>(pItem->m_pFirstChild));
           for (CXFA_ContentLayoutItem* pItemChild = iterator.GetCurrent();
                pItemChild; pItemChild = iterator.MoveToNext()) {
             if (!pItemChild->IsContentLayoutItem())
@@ -323,7 +323,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray(
         if (bOnPageArea) {
           CXFA_NodeIteratorTemplate<CXFA_ContentLayoutItem,
                                     CXFA_TraverseStrategy_ContentLayoutItem>
-          iterator((CXFA_ContentLayoutItem*)pItem);
+          iterator(static_cast<CXFA_ContentLayoutItem*>(pItem));
           for (CXFA_ContentLayoutItem* pItemChild = iterator.GetCurrent();
                pItemChild; pItemChild = iterator.MoveToNext()) {
             if (!pItemChild->IsContentLayoutItem())
@@ -375,8 +375,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_PageContent(
   CXFA_ArrayNodeList* pArrayNodeList = new CXFA_ArrayNodeList(m_pDocument);
   pArrayNodeList->SetArrayNodeList(retArray);
   pArguments->GetReturnValue()->SetObject(
-      (CXFA_Object*)pArrayNodeList,
-      m_pDocument->GetScriptContext()->GetJseNormalClass());
+      pArrayNodeList, m_pDocument->GetScriptContext()->GetJseNormalClass());
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_AbsPageCount(
     CFXJSE_Arguments* pArguments) {
-- 
cgit v1.2.3