Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fxfa / fxfa_objectacc.h
index 8880008..b09e370 100644 (file)
@@ -421,8 +421,8 @@ public:
     void                       GetPicture(CFX_WideString &wsPicture);\r
     CXFA_Script                GetScript();\r
 protected:\r
-    void               GetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);\r
-    void               SetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);\r
+    void               GetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType);\r
+    void               SetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType);\r
     FX_BOOL            SetTestValue(int32_t iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);\r
 };\r
 class CXFA_Variables : public CXFA_Data\r
@@ -696,8 +696,8 @@ public:
     void                SetCheckState(XFA_CHECKSTATE eCheckState, FX_BOOL bNotify = TRUE);\r
     CXFA_Node*          GetExclGroupNode();\r
     CXFA_Node*          GetSelectedMember();\r
-    CXFA_Node*          SetSelectedMember(FX_WSTR wsName, FX_BOOL bNotify = TRUE);\r
-    void                SetSelectedMemberByValue(FX_WSTR wsValue, \r
+    CXFA_Node*          SetSelectedMember(const CFX_WideStringC& wsName, FX_BOOL bNotify = TRUE);\r
+    void                SetSelectedMemberByValue(const CFX_WideStringC& wsValue, \r
                                                  FX_BOOL bNotify = TRUE,\r
                                                  FX_BOOL bScriptModify = FALSE,\r
                                                  FX_BOOL bSyncData = TRUE);\r
@@ -723,8 +723,8 @@ public:
     void                ClearAllSelections();\r
     void                InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue,\r
                                    int32_t nIndex = -1, FX_BOOL bNotify = FALSE);\r
-    void                GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);\r
-    void                GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);\r
+    void                GetItemLabel(const CFX_WideStringC& wsValue, CFX_WideString &wsLabel);\r
+    void                GetItemValue(const CFX_WideStringC& wsLabel, CFX_WideString &wsValue);\r
     FX_BOOL             DeleteItem(int32_t nIndex, FX_BOOL bNotify = FALSE,\r
                                    FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
     int32_t            GetHorizontalScrollPolicy();\r
@@ -734,8 +734,8 @@ public:
     FX_BOOL             GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);\r
     IFX_Locale*         GetLocal();\r
     FX_BOOL             GetValue(CFX_WideString &wsValue, XFA_VALUEPICTURE eValueType);\r
-    FX_BOOL             GetNormalizeDataValue(FX_WSTR wsValue, CFX_WideString &wsNormalizeValue);\r
-    FX_BOOL             GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);\r
+    FX_BOOL             GetNormalizeDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsNormalizeValue);\r
+    FX_BOOL             GetFormatDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsFormatedValue);\r
     void                NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);\r
     CFX_WideString      GetBarcodeType();\r
     FX_BOOL             GetBarcodeAttribute_CharEncoding(int32_t& val);\r
@@ -764,7 +764,7 @@ public:
     FX_BOOL             m_bPreNull;\r
 protected:\r
     void                SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);\r
-    void                InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, int32_t nIndex = -1);\r
+    void                InsertListTextItem(CXFA_Node* pItems, const CFX_WideStringC& wsText, int32_t nIndex = -1);\r
     void                FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);\r
 \r
     CXFA_Node*          m_pUiChildNode;\r