Index: xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp |
diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp |
index 335df6a32ea811d4868d0d805f46bb8483e346a7..c5d25bc246523e2df7dde1c4437f5155408c61d1 100644 |
--- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp |
+++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp |
@@ -25,37 +25,37 @@ CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) |
m_uScriptHash = XFA_HASHCODE_Event; |
} |
CScript_EventPseudoModel::~CScript_EventPseudoModel() {} |
-void Script_EventPseudoModel_StringProperty(FXJSE_HVALUE hValue, |
+void Script_EventPseudoModel_StringProperty(CFXJSE_Value* pValue, |
CFX_WideString& wsValue, |
FX_BOOL bSetting) { |
if (bSetting) { |
CFX_ByteString bsValue; |
- FXJSE_Value_ToUTF8String(hValue, bsValue); |
+ FXJSE_Value_ToUTF8String(pValue, bsValue); |
wsValue = CFX_WideString::FromUTF8(bsValue.AsStringC()); |
} else { |
- FXJSE_Value_SetUTF8String(hValue, FX_UTF8Encode(wsValue).AsStringC()); |
+ FXJSE_Value_SetUTF8String(pValue, FX_UTF8Encode(wsValue).AsStringC()); |
} |
} |
-void Script_EventPseudoModel_InterProperty(FXJSE_HVALUE hValue, |
+void Script_EventPseudoModel_InterProperty(CFXJSE_Value* pValue, |
int32_t& iValue, |
FX_BOOL bSetting) { |
if (bSetting) { |
- iValue = FXJSE_Value_ToInteger(hValue); |
+ iValue = FXJSE_Value_ToInteger(pValue); |
} else { |
- FXJSE_Value_SetInteger(hValue, iValue); |
+ FXJSE_Value_SetInteger(pValue, iValue); |
} |
} |
-void Script_EventPseudoModel_BooleanProperty(FXJSE_HVALUE hValue, |
+void Script_EventPseudoModel_BooleanProperty(CFXJSE_Value* pValue, |
FX_BOOL& bValue, |
FX_BOOL bSetting) { |
if (bSetting) |
- bValue = FXJSE_Value_ToBoolean(hValue); |
+ bValue = FXJSE_Value_ToBoolean(pValue); |
else |
- FXJSE_Value_SetBoolean(hValue, bValue); |
+ FXJSE_Value_SetBoolean(pValue, bValue); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Property( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
XFA_Event dwFlag, |
FX_BOOL bSetting) { |
CXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext(); |
@@ -69,67 +69,67 @@ void CScript_EventPseudoModel::Script_EventPseudoModel_Property( |
switch (dwFlag) { |
case XFA_Event::CancelAction: |
Script_EventPseudoModel_BooleanProperty( |
- hValue, pEventParam->m_bCancelAction, bSetting); |
+ pValue, pEventParam->m_bCancelAction, bSetting); |
break; |
case XFA_Event::Change: |
- Script_EventPseudoModel_StringProperty(hValue, pEventParam->m_wsChange, |
+ Script_EventPseudoModel_StringProperty(pValue, pEventParam->m_wsChange, |
bSetting); |
break; |
case XFA_Event::CommitKey: |
- Script_EventPseudoModel_InterProperty(hValue, pEventParam->m_iCommitKey, |
+ Script_EventPseudoModel_InterProperty(pValue, pEventParam->m_iCommitKey, |
bSetting); |
break; |
case XFA_Event::FullText: |
- Script_EventPseudoModel_StringProperty(hValue, pEventParam->m_wsFullText, |
+ Script_EventPseudoModel_StringProperty(pValue, pEventParam->m_wsFullText, |
bSetting); |
break; |
case XFA_Event::Keydown: |
- Script_EventPseudoModel_BooleanProperty(hValue, pEventParam->m_bKeyDown, |
+ Script_EventPseudoModel_BooleanProperty(pValue, pEventParam->m_bKeyDown, |
bSetting); |
break; |
case XFA_Event::Modifier: |
- Script_EventPseudoModel_BooleanProperty(hValue, pEventParam->m_bModifier, |
+ Script_EventPseudoModel_BooleanProperty(pValue, pEventParam->m_bModifier, |
bSetting); |
break; |
case XFA_Event::NewContentType: |
Script_EventPseudoModel_StringProperty( |
- hValue, pEventParam->m_wsNewContentType, bSetting); |
+ pValue, pEventParam->m_wsNewContentType, bSetting); |
break; |
case XFA_Event::NewText: |
- Script_EventPseudoModel_StringProperty(hValue, pEventParam->m_wsNewText, |
+ Script_EventPseudoModel_StringProperty(pValue, pEventParam->m_wsNewText, |
bSetting); |
break; |
case XFA_Event::PreviousContentType: |
Script_EventPseudoModel_StringProperty( |
- hValue, pEventParam->m_wsPrevContentType, bSetting); |
+ pValue, pEventParam->m_wsPrevContentType, bSetting); |
break; |
case XFA_Event::PreviousText: |
- Script_EventPseudoModel_StringProperty(hValue, pEventParam->m_wsPrevText, |
+ Script_EventPseudoModel_StringProperty(pValue, pEventParam->m_wsPrevText, |
bSetting); |
break; |
case XFA_Event::Reenter: |
- Script_EventPseudoModel_BooleanProperty(hValue, pEventParam->m_bReenter, |
+ Script_EventPseudoModel_BooleanProperty(pValue, pEventParam->m_bReenter, |
bSetting); |
break; |
case XFA_Event::SelectionEnd: |
- Script_EventPseudoModel_InterProperty(hValue, pEventParam->m_iSelEnd, |
+ Script_EventPseudoModel_InterProperty(pValue, pEventParam->m_iSelEnd, |
bSetting); |
break; |
case XFA_Event::SelectionStart: |
- Script_EventPseudoModel_InterProperty(hValue, pEventParam->m_iSelStart, |
+ Script_EventPseudoModel_InterProperty(pValue, pEventParam->m_iSelStart, |
bSetting); |
break; |
case XFA_Event::Shift: |
- Script_EventPseudoModel_BooleanProperty(hValue, pEventParam->m_bShift, |
+ Script_EventPseudoModel_BooleanProperty(pValue, pEventParam->m_bShift, |
bSetting); |
break; |
case XFA_Event::SoapFaultCode: |
Script_EventPseudoModel_StringProperty( |
- hValue, pEventParam->m_wsSoapFaultCode, bSetting); |
+ pValue, pEventParam->m_wsSoapFaultCode, bSetting); |
break; |
case XFA_Event::SoapFaultString: |
Script_EventPseudoModel_StringProperty( |
- hValue, pEventParam->m_wsSoapFaultString, bSetting); |
+ pValue, pEventParam->m_wsSoapFaultString, bSetting); |
break; |
case XFA_Event::Target: |
break; |
@@ -138,102 +138,102 @@ void CScript_EventPseudoModel::Script_EventPseudoModel_Property( |
} |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Change( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Change, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Change, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_CommitKey( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::CommitKey, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::CommitKey, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_FullText( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::FullText, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::FullText, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_KeyDown( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Keydown, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Keydown, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Modifier( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Modifier, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Modifier, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_NewContentType( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::NewContentType, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::NewContentType, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_NewText( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::NewText, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::NewText, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_PrevContentType( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::PreviousContentType, |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::PreviousContentType, |
bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_PrevText( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::PreviousText, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::PreviousText, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Reenter( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Reenter, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Reenter, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_SelEnd( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::SelectionEnd, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::SelectionEnd, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_SelStart( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::SelectionStart, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::SelectionStart, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Shift( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Shift, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Shift, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_SoapFaultCode( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::SoapFaultCode, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::SoapFaultCode, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_SoapFaultString( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::SoapFaultString, |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::SoapFaultString, |
bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Target( |
- FXJSE_HVALUE hValue, |
+ CFXJSE_Value* pValue, |
FX_BOOL bSetting, |
XFA_ATTRIBUTE eAttribute) { |
- Script_EventPseudoModel_Property(hValue, XFA_Event::Target, bSetting); |
+ Script_EventPseudoModel_Property(pValue, XFA_Event::Target, bSetting); |
} |
void CScript_EventPseudoModel::Script_EventPseudoModel_Emit( |
CFXJSE_Arguments* pArguments) { |