Remove FXJSE_HOBJECT and FXJSE_HVALUE for CFXJSE_Value*

xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/parser/xfa_script_layoutpseudomodel.h"
 
 #include <set>
 
@@ skipping 12 matching lines @@
 #include "xfa/fxfa/parser/xfa_script_imp.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 #include "xfa/fxjse/cfxjse_arguments.h"
 
 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(
-    FXJSE_HVALUE hValue,
+    CFXJSE_Value* pValue,
     FX_BOOL bSetting,
     XFA_ATTRIBUTE eAttribute) {
   CXFA_FFNotify* pNotify = m_pDocument->GetParser()->GetNotify();
   if (!pNotify) {
     return;
   }
   if (bSetting) {
     ThrowScriptErrorMessage(XFA_IDS_UNABLE_SET_READY);
     return;
   }
   int32_t iStatus = pNotify->GetLayoutStatus();
-  FXJSE_Value_SetBoolean(hValue, iStatus >= 2);
+  FXJSE_Value_SetBoolean(pValue, iStatus >= 2);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_HWXY(
     CFXJSE_Arguments* pArguments,
     XFA_LAYOUTMODEL_HWXY layoutModel) {
   int32_t iLength = pArguments->GetLength();
   if (iLength < 1 || iLength > 3) {
     const FX_WCHAR* methodName = NULL;
     switch (layoutModel) {
       case XFA_LAYOUTMODEL_H:
         methodName = L"h";
@@ skipping 36 matching lines @@
   CFX_RectF rtRect;
   CXFA_Measurement measure;
   CXFA_LayoutItem* pLayoutItem = pDocLayout->GetLayoutItem(pNode);
   if (!pLayoutItem) {
     return;
   }
   while (iIndex > 0 && pLayoutItem) {
     pLayoutItem = pLayoutItem->GetNext();
     iIndex--;
   }
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
   if (!pLayoutItem) {
-    FXJSE_Value_SetFloat(hValue, 0);
+    FXJSE_Value_SetFloat(pValue, 0);
     return;
   }
   pLayoutItem->GetRect(rtRect, TRUE);
   switch (layoutModel) {
     case XFA_LAYOUTMODEL_H:
       measure.Set(rtRect.height, XFA_UNIT_Pt);
       break;
     case XFA_LAYOUTMODEL_W:
       measure.Set(rtRect.width, XFA_UNIT_Pt);
       break;
     case XFA_LAYOUTMODEL_X:
       measure.Set(rtRect.left, XFA_UNIT_Pt);
       break;
     case XFA_LAYOUTMODEL_Y:
       measure.Set(rtRect.top, XFA_UNIT_Pt);
       break;
   }
   XFA_UNIT unit = measure.GetUnit(wsUnit.AsStringC());
   FX_FLOAT fValue = measure.ToUnit(unit);
   fValue = FXSYS_round(fValue * 1000) / 1000.0f;
-  if (hValue) {
-    FXJSE_Value_SetFloat(hValue, fValue);
+  if (pValue) {
+    FXJSE_Value_SetFloat(pValue, fValue);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_H(
     CFXJSE_Arguments* pArguments) {
   Script_LayoutPseudoModel_HWXY(pArguments, XFA_LAYOUTMODEL_H);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_W(
     CFXJSE_Arguments* pArguments) {
   Script_LayoutPseudoModel_HWXY(pArguments, XFA_LAYOUTMODEL_W);
 }
@@ skipping 21 matching lines @@
         continue;
       }
       CXFA_Node* pMasterPage = pLayoutPage->GetMasterPage();
       if (pMasterPage->GetInteger(XFA_ATTRIBUTE_Numbered)) {
         iPageCount++;
       }
     }
   } else {
     iPageCount = iPageNum;
   }
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageCount);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageCount);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_PageCount(
     CFXJSE_Arguments* pArguments) {
   Script_LayoutPseudoModel_NumberedPageCount(pArguments, TRUE);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_PageSpan(
     CFXJSE_Arguments* pArguments) {
   int32_t iLength = pArguments->GetLength();
   if (iLength != 1) {
     ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"pageSpan");
     return;
   }
   CXFA_Node* pNode = NULL;
   if (iLength >= 1) {
     pNode = static_cast<CXFA_Node*>(pArguments->GetObject(0));
   }
   if (!pNode) {
     return;
   }
   CXFA_LayoutProcessor* pDocLayout = m_pDocument->GetDocLayout();
   if (!pDocLayout) {
     return;
   }
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
   CXFA_LayoutItem* pLayoutItem = pDocLayout->GetLayoutItem(pNode);
   if (!pLayoutItem) {
-    FXJSE_Value_SetInteger(hValue, -1);
+    FXJSE_Value_SetInteger(pValue, -1);
     return;
   }
   int32_t iLast = pLayoutItem->GetLast()->GetPage()->GetPageIndex();
   int32_t iFirst = pLayoutItem->GetFirst()->GetPage()->GetPageIndex();
   int32_t iPageSpan = iLast - iFirst + 1;
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageSpan);
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageSpan);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Page(
     CFXJSE_Arguments* pArguments) {
   Script_LayoutPseudoModel_PageImp(pArguments, FALSE);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_GetObjArray(
     CXFA_LayoutProcessor* pDocLayout,
     int32_t iPageNo,
     const CFX_WideString& wsType,
@@ skipping 172 matching lines @@
   Script_LayoutPseudoModel_NumberedPageCount(pArguments, FALSE);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_AbsPageCountInBatch(
     CFXJSE_Arguments* pArguments) {
   CXFA_FFNotify* pNotify = m_pDocument->GetParser()->GetNotify();
   if (!pNotify) {
     return;
   }
   CXFA_FFDoc* hDoc = pNotify->GetHDOC();
   int32_t iPageCount = pNotify->GetDocProvider()->AbsPageCountInBatch(hDoc);
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageCount);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageCount);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_SheetCountInBatch(
     CFXJSE_Arguments* pArguments) {
   CXFA_FFNotify* pNotify = m_pDocument->GetParser()->GetNotify();
   if (!pNotify) {
     return;
   }
   CXFA_FFDoc* hDoc = pNotify->GetHDOC();
   int32_t iPageCount = pNotify->GetDocProvider()->SheetCountInBatch(hDoc);
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageCount);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageCount);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Relayout(
     CFXJSE_Arguments* pArguments) {
   CXFA_Node* pRootNode = m_pDocument->GetRoot();
   CXFA_Node* pFormRoot = pRootNode->GetFirstChildByClass(XFA_ELEMENT_Form);
   ASSERT(pFormRoot);
   CXFA_Node* pContentRootNode = pFormRoot->GetNodeItem(XFA_NODEITEM_FirstChild);
   CXFA_LayoutProcessor* pLayoutProcessor = m_pDocument->GetLayoutProcessor();
   if (pContentRootNode) {
@@ skipping 28 matching lines @@
   if (!pDocLayout) {
     return;
   }
   CXFA_FFWidget* hWidget =
       pNotify->GetHWidget(pDocLayout->GetLayoutItem(pNode));
   if (!hWidget) {
     return;
   }
   CXFA_FFDoc* hDoc = pNotify->GetHDOC();
   int32_t iPageCount = pNotify->GetDocProvider()->AbsPageInBatch(hDoc, hWidget);
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageCount);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageCount);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_SheetInBatch(
     CFXJSE_Arguments* pArguments) {
   int32_t iLength = pArguments->GetLength();
   if (iLength != 1) {
     ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                             L"sheetInBatch");
     return;
   }
@@ skipping 12 matching lines @@
   if (!pDocLayout) {
     return;
   }
   CXFA_FFWidget* hWidget =
       pNotify->GetHWidget(pDocLayout->GetLayoutItem(pNode));
   if (!hWidget) {
     return;
   }
   CXFA_FFDoc* hDoc = pNotify->GetHDOC();
   int32_t iPageCount = pNotify->GetDocProvider()->SheetInBatch(hDoc, hWidget);
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, iPageCount);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, iPageCount);
   }
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Sheet(
     CFXJSE_Arguments* pArguments) {
   Script_LayoutPseudoModel_PageImp(pArguments, TRUE);
 }
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_RelayoutPageArea(
     CFXJSE_Arguments* pArguments) {}
 void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_SheetCount(
     CFXJSE_Arguments* pArguments) {
@@ skipping 15 matching lines @@
       methodName = L"page";
     }
     ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, methodName);
     return;
   }
   CXFA_Node* pNode = NULL;
   if (iLength >= 1) {
     pNode = static_cast<CXFA_Node*>(pArguments->GetObject(0));
   }
   int32_t iPage = 0;
-  FXJSE_HVALUE hValue = pArguments->GetReturnValue();
-  if (!pNode && hValue) {
-    FXJSE_Value_SetInteger(hValue, iPage);
+  CFXJSE_Value* pValue = pArguments->GetReturnValue();
+  if (!pNode && pValue) {
+    FXJSE_Value_SetInteger(pValue, iPage);
   }
   CXFA_LayoutProcessor* pDocLayout = m_pDocument->GetDocLayout();
   if (!pDocLayout) {
     return;
   }
   CXFA_LayoutItem* pLayoutItem = pDocLayout->GetLayoutItem(pNode);
   if (!pLayoutItem) {
-    FXJSE_Value_SetInteger(hValue, -1);
+    FXJSE_Value_SetInteger(pValue, -1);
     return;
   }
   iPage = pLayoutItem->GetFirst()->GetPage()->GetPageIndex();
-  if (hValue) {
-    FXJSE_Value_SetInteger(hValue, bAbsPage ? iPage : iPage + 1);
+  if (pValue) {
+    FXJSE_Value_SetInteger(pValue, bAbsPage ? iPage : iPage + 1);
   }
 }