From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- xfa/include/fxfa/fxfa.h | 50 +++++++++++++++++++-------------------- xfa/include/fxfa/fxfa_basic.h | 18 +++++++------- xfa/include/fxfa/fxfa_objectacc.h | 18 +++++++------- xfa/include/fxfa/fxfa_widget.h | 2 +- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'xfa/include/fxfa') diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index a6cc5e1484..648b042c6f 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -217,15 +217,15 @@ public: * @param[in] dwButtonType Button type, refer to XFA_MESSAGEBUTTON. * @return A valid integer representing the value of the button pressed by the user, refer to XFA_ID. */ - virtual int32_t MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""), + virtual int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle = FX_WSTRC(L""), FX_DWORD dwIconType = 0, FX_DWORD dwButtonType = 0) = 0; /** * Get a response from the user. * @param[in] bMark - Mask the user input with * (asterisks) when true, */ - virtual void Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR wsTitle = FX_WSTRC(L""), - FX_WSTR wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0; + virtual void Response(CFX_WideString &wsAnswer, const CFX_WideStringC& wsQuestion, const CFX_WideStringC& wsTitle = FX_WSTRC(L""), + const CFX_WideStringC& wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0; virtual int32_t GetDocumentCountInBatch() = 0; virtual int32_t GetCurDocumentInBatch() = 0; @@ -234,7 +234,7 @@ public: * Download something from somewhere. * @param[in] wsURL - http, ftp, such as "http://www.w3.org/TR/REC-xml-names/". */ - virtual IFX_FileRead* DownloadURL(FX_WSTR wsURL) = 0; + virtual IFX_FileRead* DownloadURL(const CFX_WideStringC& wsURL) = 0; /** * POST data to the given url. @@ -247,8 +247,8 @@ public: * @param[out] wsResponse decoded response from server. * @return TRUE Server permitted the post request, FALSE otherwise. */ - virtual FX_BOOL PostRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsContentType, - FX_WSTR wsEncode, FX_WSTR wsHeader, CFX_WideString &wsResponse) = 0; + virtual FX_BOOL PostRequestURL(const CFX_WideStringC& wsURL, const CFX_WideStringC& wsData, const CFX_WideStringC& wsContentType, + const CFX_WideStringC& wsEncode, const CFX_WideStringC& wsHeader, CFX_WideString &wsResponse) = 0; /** * PUT data to the given url. @@ -257,10 +257,10 @@ public: * @param[in] wsEncode the encode of data including UTF-8, UTF-16, ISO8859-1, any recognized [IANA]character encoding * @return TRUE Server permitted the post request, FALSE otherwise. */ - virtual FX_BOOL PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEncode) = 0; + virtual FX_BOOL PutRequestURL(const CFX_WideStringC& wsURL, const CFX_WideStringC& wsData, const CFX_WideStringC& wsEncode) = 0; virtual void LoadString(int32_t iStringID, CFX_WideString &wsString) = 0; - virtual FX_BOOL ShowFileDialog(FX_WSTR wsTitle, FX_WSTR wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0; + virtual FX_BOOL ShowFileDialog(const CFX_WideStringC& wsTitle, const CFX_WideStringC& wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0; virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0; }; class IXFA_FontMgr @@ -269,8 +269,8 @@ public: static IXFA_FontMgr* CreateDefault(); virtual ~IXFA_FontMgr(); - virtual IFX_Font* GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; - virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; + virtual IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; + virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; }; class IXFA_App { @@ -307,7 +307,7 @@ public: virtual FX_BOOL Undo(IXFA_Widget* hWidget) = 0; virtual FX_BOOL Redo(IXFA_Widget* hWidget) = 0; virtual FX_BOOL GetSuggestWords(IXFA_Widget* hWidget, CFX_PointF pointf, CFX_ByteStringArray &sSuggest) = 0; - virtual FX_BOOL ReplaceSpellCheckWord(IXFA_Widget* hWidget, CFX_PointF pointf, FX_BSTR bsReplace) = 0; + virtual FX_BOOL ReplaceSpellCheckWord(IXFA_Widget* hWidget, CFX_PointF pointf, const CFX_ByteStringC& bsReplace) = 0; }; #define XFA_INVALIDATE_AllPages 0x00000000 #define XFA_INVALIDATE_CurrentPage 0x00000001 @@ -348,10 +348,10 @@ public: virtual FX_BOOL IsCalculationsEnabled(IXFA_Doc* hDoc) = 0; virtual void SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0; virtual void GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle) = 0; - virtual void SetTitle(IXFA_Doc* hDoc, FX_WSTR wsTitle) = 0; - virtual void ExportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath, FX_BOOL bXDP = TRUE) = 0; - virtual void ImportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath) = 0; - virtual void GotoURL(IXFA_Doc* hDoc, FX_WSTR bsURL, FX_BOOL bAppend = TRUE) = 0; + virtual void SetTitle(IXFA_Doc* hDoc, const CFX_WideStringC& wsTitle) = 0; + virtual void ExportData(IXFA_Doc* hDoc, const CFX_WideStringC& wsFilePath, FX_BOOL bXDP = TRUE) = 0; + virtual void ImportData(IXFA_Doc* hDoc, const CFX_WideStringC& wsFilePath) = 0; + virtual void GotoURL(IXFA_Doc* hDoc, const CFX_WideStringC& bsURL, FX_BOOL bAppend = TRUE) = 0; virtual FX_BOOL IsValidationsEnabled(IXFA_Doc* hDoc) = 0; virtual void SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0; virtual void SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0; @@ -364,7 +364,7 @@ public: { return 0; } - virtual FX_BOOL Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, FX_WSTR wsExpression, FX_WSTR wsXMLIdent, FX_WSTR wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE) + virtual FX_BOOL Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, const CFX_WideStringC& wsExpression, const CFX_WideStringC& wsXMLIdent, const CFX_WideStringC& wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE) { return 0; } @@ -381,11 +381,11 @@ public: virtual void AddDoRecord(IXFA_Widget* hWidget) = 0; virtual FX_BOOL SubmitData(IXFA_Doc* hDoc, CXFA_Submit submit) = 0; - virtual FX_BOOL CheckWord(IXFA_Doc* hDoc, FX_BSTR sWord) = 0; - virtual FX_BOOL GetSuggestWords(IXFA_Doc* hDoc, FX_BSTR sWord, CFX_ByteStringArray& sSuggest) = 0; - virtual FX_BOOL GetPDFScriptObject(IXFA_Doc* hDoc, FX_BSTR utf8Name, FXJSE_HVALUE hValue) = 0; - virtual FX_BOOL GetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0; - virtual FX_BOOL SetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0; + virtual FX_BOOL CheckWord(IXFA_Doc* hDoc, const CFX_ByteStringC& sWord) = 0; + virtual FX_BOOL GetSuggestWords(IXFA_Doc* hDoc, const CFX_ByteStringC& sWord, CFX_ByteStringArray& sSuggest) = 0; + virtual FX_BOOL GetPDFScriptObject(IXFA_Doc* hDoc, const CFX_ByteStringC& utf8Name, FXJSE_HVALUE hValue) = 0; + virtual FX_BOOL GetGlobalProperty(IXFA_Doc* hDoc, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue) = 0; + virtual FX_BOOL SetGlobalProperty(IXFA_Doc* hDoc, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue) = 0; virtual CPDF_Document* OpenPDF(IXFA_Doc* hDoc, IFX_FileRead* pFile, FX_BOOL bTakeOverFile) = 0; virtual IFX_FileRead* OpenLinkedFile(IXFA_Doc* hDoc, const CFX_WideString& wsLink) = 0; }; @@ -418,14 +418,14 @@ public: virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0; virtual void GetPackageName(IXFA_Doc* hDoc, int32_t iPackage, CFX_WideStringC &wsPackage) = 0; - virtual FX_BOOL SavePackage(IXFA_Doc* hDoc, FX_WSTR wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0; + virtual FX_BOOL SavePackage(IXFA_Doc* hDoc, const CFX_WideStringC& wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0; virtual FX_BOOL CloseDoc(IXFA_Doc* hDoc) = 0; virtual FX_BOOL ImportData(IXFA_Doc* hDoc, IFX_FileRead* pStream, FX_BOOL bXDP = TRUE) = 0; virtual void SetJSERuntime(IXFA_Doc* hDoc, FXJSE_HRUNTIME hRuntime) = 0; virtual FXJSE_HVALUE GetXFAScriptObject(IXFA_Doc* hDoc) = 0; virtual XFA_ATTRIBUTEENUM GetRestoreState(IXFA_Doc* hDoc) = 0; - virtual FX_BOOL RunDocScript(IXFA_Doc* hDoc, XFA_SCRIPTTYPE eScriptType, FX_WSTR wsScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hThisObject) = 0; + virtual FX_BOOL RunDocScript(IXFA_Doc* hDoc, XFA_SCRIPTTYPE eScriptType, const CFX_WideStringC& wsScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hThisObject) = 0; }; enum XFA_EVENTTYPE { XFA_EVENT_Click, @@ -537,8 +537,8 @@ public: virtual void UpdateDocView() = 0; virtual int32_t CountPageViews() = 0; virtual IXFA_PageView* GetPageView(int32_t nIndex) = 0; - virtual IXFA_Widget* GetWidgetByName(FX_WSTR wsName) = 0; - virtual CXFA_WidgetAcc* GetWidgetAccByName(FX_WSTR wsName) = 0; + virtual IXFA_Widget* GetWidgetByName(const CFX_WideStringC& wsName) = 0; + virtual CXFA_WidgetAcc* GetWidgetAccByName(const CFX_WideStringC& wsName) = 0; virtual void ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL) = 0; virtual int32_t ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0; virtual IXFA_WidgetHandler* GetWidgetHandler() = 0; diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index b157fff24c..7b635e01e4 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -83,7 +83,7 @@ typedef struct _XFA_PACKETINFO { FX_DWORD eFlags; } XFA_PACKETINFO, * XFA_LPPACKETINFO; typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO; -XFA_LPCPACKETINFO XFA_GetPacketByName(FX_WSTR wsName); +XFA_LPCPACKETINFO XFA_GetPacketByName(const CFX_WideStringC& wsName); XFA_LPCPACKETINFO XFA_GetPacketByID(FX_DWORD dwPacket); extern const XFA_PACKETINFO g_XFAPacketData[]; inline XFA_LPCPACKETINFO XFA_GetPacketByIndex(XFA_PACKET ePacket) @@ -927,7 +927,7 @@ typedef struct _XFA_ELEMENTINFO { } XFA_ELEMENTINFO, * XFA_LPELEMENTINFO; typedef XFA_ELEMENTINFO const * XFA_LPCELEMENTINFO; int32_t XFA_GetElementCount(); -XFA_LPCELEMENTINFO XFA_GetElementByName(FX_WSTR wsName); +XFA_LPCELEMENTINFO XFA_GetElementByName(const CFX_WideStringC& wsName); XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName); enum XFA_ATTRIBUTETYPE { XFA_ATTRIBUTETYPE_NOTSURE, @@ -947,7 +947,7 @@ typedef struct _XFA_ATTRIBUTEINFO { } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO; typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO; int32_t XFA_GetAttributeCount(); -XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName); +XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(const CFX_WideStringC& wsName); XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName); FX_BOOL XFA_GetAttributeDefaultValue(void* &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket); XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket); @@ -989,7 +989,7 @@ typedef struct _XFA_ATTRIBUTEENUMINFO { XFA_ATTRIBUTEENUM eName; } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO; typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO; -XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(FX_WSTR wsName); +XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(const CFX_WideStringC& wsName); XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByID(XFA_ATTRIBUTEENUM eName); enum XFA_UNIT { XFA_UNIT_Unknown, @@ -1006,7 +1006,7 @@ enum XFA_UNIT { class CXFA_Measurement { public: - void Set(FX_WSTR wsMeasure); + void Set(const CFX_WideStringC& wsMeasure); void Set(FX_FLOAT fValue, XFA_UNIT eUnit) { m_fValue = fValue; @@ -1032,7 +1032,7 @@ public: { Set(-1, XFA_UNIT_Unknown); } - CXFA_Measurement(FX_WSTR wsMeasure) + CXFA_Measurement(const CFX_WideStringC& wsMeasure) { Set(wsMeasure); } @@ -1040,7 +1040,7 @@ public: { Set(fValue, eUnit); } - static XFA_UNIT GetUnit(FX_WSTR wsUnit); + static XFA_UNIT GetUnit(const CFX_WideStringC& wsUnit); protected: FX_FLOAT m_fValue; XFA_UNIT m_eUnit; @@ -1055,7 +1055,7 @@ typedef struct _XFA_METHODINFO { } XFA_METHODINFO, * XFA_LPMETHODINFO; typedef XFA_METHODINFO const * XFA_LPCMETHODINFO; int32_t XFA_GetMethodCount(); -XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement, FX_WSTR wsMethodName); +XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement, const CFX_WideStringC& wsMethodName); typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK) (FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); enum XFA_SCRIPT_TYPE { XFA_SCRIPT_Basic, @@ -1069,5 +1069,5 @@ typedef struct _XFA_SCRIPTATTRIBUTEINFO { FX_WORD eValueType; } XFA_SCRIPTATTRIBUTEINFO, * XFA_LPSCRIPTATTRIBUTEINFO; typedef XFA_SCRIPTATTRIBUTEINFO const * XFA_LPCSCRIPTATTRIBUTEINFO; -XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, FX_WSTR wsAttributeName); +XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, const CFX_WideStringC& wsAttributeName); #endif diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index 888000805f..b09e37097b 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -421,8 +421,8 @@ public: void GetPicture(CFX_WideString &wsPicture); CXFA_Script GetScript(); protected: - void GetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType); - void SetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType); + void GetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType); + void SetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType); FX_BOOL SetTestValue(int32_t iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName); }; class CXFA_Variables : public CXFA_Data @@ -696,8 +696,8 @@ public: void SetCheckState(XFA_CHECKSTATE eCheckState, FX_BOOL bNotify = TRUE); CXFA_Node* GetExclGroupNode(); CXFA_Node* GetSelectedMember(); - CXFA_Node* SetSelectedMember(FX_WSTR wsName, FX_BOOL bNotify = TRUE); - void SetSelectedMemberByValue(FX_WSTR wsValue, + CXFA_Node* SetSelectedMember(const CFX_WideStringC& wsName, FX_BOOL bNotify = TRUE); + void SetSelectedMemberByValue(const CFX_WideStringC& wsValue, FX_BOOL bNotify = TRUE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE); @@ -723,8 +723,8 @@ public: void ClearAllSelections(); void InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue, int32_t nIndex = -1, FX_BOOL bNotify = FALSE); - void GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel); - void GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue); + void GetItemLabel(const CFX_WideStringC& wsValue, CFX_WideString &wsLabel); + void GetItemValue(const CFX_WideStringC& wsLabel, CFX_WideString &wsValue); FX_BOOL DeleteItem(int32_t nIndex, FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE); int32_t GetHorizontalScrollPolicy(); @@ -734,8 +734,8 @@ public: FX_BOOL GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture); IFX_Locale* GetLocal(); FX_BOOL GetValue(CFX_WideString &wsValue, XFA_VALUEPICTURE eValueType); - FX_BOOL GetNormalizeDataValue(FX_WSTR wsValue, CFX_WideString &wsNormalizeValue); - FX_BOOL GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue); + FX_BOOL GetNormalizeDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsNormalizeValue); + FX_BOOL GetFormatDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsFormatedValue); void NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput); CFX_WideString GetBarcodeType(); FX_BOOL GetBarcodeAttribute_CharEncoding(int32_t& val); @@ -764,7 +764,7 @@ public: FX_BOOL m_bPreNull; protected: void SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify); - void InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, int32_t nIndex = -1); + void InsertListTextItem(CXFA_Node* pItems, const CFX_WideStringC& wsText, int32_t nIndex = -1); void FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput); CXFA_Node* m_pUiChildNode; diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 21d007d7f1..72581ae232 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -33,7 +33,7 @@ public: void ResetData(); - void SetImageEdit(FX_WSTR wsContentType, FX_WSTR wsHref, FX_WSTR wsData); + void SetImageEdit(const CFX_WideStringC& wsContentType, const CFX_WideStringC& wsHref, const CFX_WideStringC& wsData); CXFA_WidgetAcc* GetExclGroup(); CXFA_FFDocView* GetDocView(); -- cgit v1.2.3