Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / parser / xfa_script_imp.h
index fc43583..d0bcee3 100644 (file)
@@ -25,9 +25,9 @@ public:
     {\r
         return m_pEventParam;\r
     }\r
-    virtual FX_BOOL                    RunScript(XFA_SCRIPTLANGTYPE eScriptType, FX_WSTR wsScript, FXJSE_HVALUE hRetValue, CXFA_Object* pThisObject = NULL);\r
+    virtual FX_BOOL                    RunScript(XFA_SCRIPTLANGTYPE eScriptType, const CFX_WideStringC& wsScript, FXJSE_HVALUE hRetValue, CXFA_Object* pThisObject = NULL);\r
 \r
-    virtual int32_t            ResolveObjects(CXFA_Object* refNode, FX_WSTR wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS,  FX_DWORD dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL);\r
+    virtual int32_t            ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS,  FX_DWORD dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL);\r
     virtual FXJSE_HVALUE       GetJSValueFromMap(CXFA_Object* pObject);\r
     virtual void                       CacheList(CXFA_NodeList* pList)\r
     {\r
@@ -60,16 +60,16 @@ public:
     {\r
         return m_eRunAtType != XFA_ATTRIBUTEENUM_Server;\r
     }\r
-    FX_BOOL                                    QueryNodeByFlag(CXFA_Node* refNode, FX_WSTR propname, FXJSE_HVALUE hValue, FX_DWORD dwFlag, FX_BOOL bSetting);\r
-    FX_BOOL                                    QueryVariableHValue(CXFA_Node* pScriptNode, FX_BSTR szPropName, FXJSE_HVALUE hValue, FX_BOOL bGetter);\r
-    FX_BOOL                                    QueryBuiltinHValue(FX_BSTR szPropName, FXJSE_HVALUE hValue);\r
-    static void                                GlobalPropertyGetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);\r
-    static void                                GlobalPropertySetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);\r
-    static void                                NormalPropertyGetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);\r
-    static void                                NormalPropertySetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);\r
-    static void                                NormalMethodCall(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args);\r
-    static int32_t                     NormalPropTypeGetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);\r
-    static int32_t                     GlobalPropTypeGetter(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);\r
+    FX_BOOL                                    QueryNodeByFlag(CXFA_Node* refNode, const CFX_WideStringC& propname, FXJSE_HVALUE hValue, FX_DWORD dwFlag, FX_BOOL bSetting);\r
+    FX_BOOL                                    QueryVariableHValue(CXFA_Node* pScriptNode, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue, FX_BOOL bGetter);\r
+    FX_BOOL                                    QueryBuiltinHValue(const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);\r
+    static void                                GlobalPropertyGetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);\r
+    static void                                GlobalPropertySetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);\r
+    static void                                NormalPropertyGetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);\r
+    static void                                NormalPropertySetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);\r
+    static void                                NormalMethodCall(FXJSE_HOBJECT hThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments &args);\r
+    static int32_t                     NormalPropTypeGetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FX_BOOL bQueryIn);\r
+    static int32_t                     GlobalPropTypeGetter(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FX_BOOL bQueryIn);\r
     FX_BOOL                                    RunVariablesScript(CXFA_Node* pScriptNode);\r
     CXFA_Object*                       GetVariablesThis(CXFA_Object* pObject, FX_BOOL bScriptNode = FALSE);\r
     void                                       ReleaseVariablesMap();\r