Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / common / xfa_object.h
index 4d2c764..69c80da 100644 (file)
@@ -163,11 +163,11 @@ public:
     CXFA_Node*                 GetModelNode();\r
     void                               UpdateNameHash();\r
     FX_BOOL                            HasAttribute(XFA_ATTRIBUTE eAttr, FX_BOOL bCanInherit = FALSE);\r
-    FX_BOOL                            SetAttribute(XFA_ATTRIBUTE eAttr, FX_WSTR wsValue, FX_BOOL bNotify = FALSE);\r
+    FX_BOOL                            SetAttribute(XFA_ATTRIBUTE eAttr, const CFX_WideStringC& wsValue, FX_BOOL bNotify = FALSE);\r
     FX_BOOL                            GetAttribute(XFA_ATTRIBUTE eAttr, CFX_WideString &wsValue, FX_BOOL bUseDefault = TRUE);\r
-    FX_BOOL                            SetAttribute(FX_WSTR wsAttr, FX_WSTR wsValue, FX_BOOL bNotify = FALSE);\r
-    FX_BOOL                            GetAttribute(FX_WSTR wsAttr, CFX_WideString &wsValue, FX_BOOL bUseDefault = TRUE);\r
-    FX_BOOL                            RemoveAttribute(FX_WSTR wsAttr);\r
+    FX_BOOL                            SetAttribute(const CFX_WideStringC& wsAttr, const CFX_WideStringC& wsValue, FX_BOOL bNotify = FALSE);\r
+    FX_BOOL                            GetAttribute(const CFX_WideStringC& wsAttr, CFX_WideString &wsValue, FX_BOOL bUseDefault = TRUE);\r
+    FX_BOOL                            RemoveAttribute(const CFX_WideStringC& wsAttr);\r
     FX_BOOL                            SetContent(const CFX_WideString& wsContent, const CFX_WideString& wsXMLValue, FX_BOOL bNotify = FALSE,  FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
     FX_BOOL                            TryContent(CFX_WideString& wsContent, FX_BOOL bScriptModify = FALSE, FX_BOOL bProto = TRUE);\r
     CFX_WideString             GetContent();\r
@@ -259,11 +259,11 @@ public:
     CXFA_WidgetData*   GetContainerWidgetData();\r
     FX_BOOL                            GetLocaleName(CFX_WideString& wsLocaleName);\r
     XFA_ATTRIBUTEENUM  GetIntact();\r
-    CXFA_Node*                 GetFirstChildByName(FX_WSTR wsNodeName) const;\r
+    CXFA_Node*                 GetFirstChildByName(const CFX_WideStringC& wsNodeName) const;\r
     CXFA_Node*                 GetFirstChildByName(FX_DWORD dwNodeNameHash) const;\r
     CXFA_Node*                 GetFirstChildByClass(XFA_ELEMENT eNodeClass) const;\r
     CXFA_Node*                 GetNextSameNameSibling(FX_DWORD dwNodeNameHash) const;\r
-    CXFA_Node*                 GetNextSameNameSibling(FX_WSTR wsNodeName) const;\r
+    CXFA_Node*                 GetNextSameNameSibling(const CFX_WideStringC& wsNodeName) const;\r
     CXFA_Node*                 GetNextSameClassSibling(XFA_ELEMENT eNodeClass) const;\r
     int32_t                    GetNodeSameNameIndex() const;\r
     int32_t                    GetNodeSameClassIndex() const;\r
@@ -434,13 +434,13 @@ protected:
     void                               OnRemoved(CXFA_Node *pParent, CXFA_Node *pRemoved, FX_BOOL bNotify);\r
     void                               OnChanging(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify);\r
     void                               OnChanged(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify, FX_BOOL bScriptModify = FALSE);\r
-    int32_t                    execSingleEventByName(FX_WSTR wsEventName, XFA_ELEMENT eElementType);\r
+    int32_t                    execSingleEventByName(const CFX_WideStringC& wsEventName, XFA_ELEMENT eElementType);\r
     FX_BOOL                            SetScriptContent(const CFX_WideString& wsContent, const CFX_WideString& wsXMLValue, FX_BOOL bNotify = TRUE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
     CFX_WideString             GetScriptContent(FX_BOOL bScriptModify = FALSE);\r
     XFA_LPMAPMODULEDATA        GetMapModuleData(FX_BOOL bCreateNew);\r
     void                               SetMapModuleValue(void* pKey, void* pValue);\r
     FX_BOOL                            GetMapModuleValue(void* pKey, void* &pValue);\r
-    void                               SetMapModuleString(void* pKey, FX_WSTR wsValue);\r
+    void                               SetMapModuleString(void* pKey, const CFX_WideStringC& wsValue);\r
     FX_BOOL                            GetMapModuleString(void* pKey, CFX_WideStringC &wsValue);\r
     void                               SetMapModuleBuffer(void* pKey, void* pValue, int32_t iBytes, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL);\r
     FX_BOOL                            GetMapModuleBuffer(void* pKey, void* &pValue, int32_t &iBytes, FX_BOOL bProtoAlso = TRUE);\r
@@ -510,7 +510,7 @@ public:
     {\r
         return XFA_ELEMENT_NodeList;\r
     }\r
-    CXFA_Node*                 NamedItem(FX_WSTR wsName);\r
+    CXFA_Node*                 NamedItem(const CFX_WideStringC& wsName);\r
     virtual int32_t    GetLength() = 0;\r
     virtual FX_BOOL            Append(CXFA_Node* pNode) = 0;\r
     virtual FX_BOOL            Insert(CXFA_Node* pNewNode, CXFA_Node* pBeforeNode) = 0;\r