Index: 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 37c64b6b0574000280125e4a2bbda41e37254ebe..00bdd35ae7c8c08b4276b1937c534f6eba334cff 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) { |