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.

24 files changed, 51 insertions, 51 deletions

diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
index 7c489d2dee..6ca86e7d4a 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
@@ -85,11 +85,11 @@ FWL_ERR IFWL_ComboBox::EditDoClipboard(int32_t iCmd)
 {

     return ((CFWL_ComboBoxImp*)m_pData)->EditDoClipboard(iCmd);

 }

-FX_BOOL IFWL_ComboBox::EditRedo(FX_BSTR bsRecord)

+FX_BOOL IFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord)

 {

     return ((CFWL_ComboBoxImp*)m_pData)->EditRedo(bsRecord);

 }

-FX_BOOL IFWL_ComboBox::EditUndo(FX_BSTR bsRecord)

+FX_BOOL IFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord)

 {

     return ((CFWL_ComboBoxImp*)m_pData)->EditUndo(bsRecord);

 }

@@ -867,12 +867,12 @@ FWL_ERR CFWL_ComboBoxImp::EditDoClipboard(int32_t iCmd)
     _FWL_RETURN_VALUE_IF_FAIL(m_pEdit, FWL_ERR_Indefinite);

     return m_pEdit->DoClipboard(iCmd);

 }

-FX_BOOL	CFWL_ComboBoxImp::EditRedo(FX_BSTR bsRecord)

+FX_BOOL	CFWL_ComboBoxImp::EditRedo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdit, FALSE);

     return m_pEdit->Redo(bsRecord);

 }

-FX_BOOL CFWL_ComboBoxImp::EditUndo(FX_BSTR bsRecord)

+FX_BOOL CFWL_ComboBoxImp::EditUndo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdit, FALSE);

     return m_pEdit->Undo(bsRecord);

diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index a8c1655ec8..b161f82960 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -137,11 +137,11 @@ FX_BOOL	IFWL_Edit::Delete()
 {

     return ((CFWL_EditImp*)m_pData)->Delete();

 }

-FX_BOOL	IFWL_Edit::Redo(FX_BSTR bsRecord)

+FX_BOOL	IFWL_Edit::Redo(const CFX_ByteStringC& bsRecord)

 {

     return ((CFWL_EditImp*)m_pData)->Redo(bsRecord);

 }

-FX_BOOL	IFWL_Edit::Undo(FX_BSTR bsRecord)

+FX_BOOL	IFWL_Edit::Undo(const CFX_ByteStringC& bsRecord)

 {

     return ((CFWL_EditImp*)m_pData)->Undo(bsRecord);

 }

@@ -189,7 +189,7 @@ FX_BOOL IFWL_Edit::GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSugg
 {

     return ((CFWL_EditImp*)m_pData)->GetSuggestWords(pointf, sSuggest);

 }

-FX_BOOL IFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace)

+FX_BOOL IFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace)

 {

     return ((CFWL_EditImp*)m_pData)->ReplaceSpellCheckWord(pointf, bsReplace);

 }

@@ -463,7 +463,7 @@ FX_BOOL CFWL_EditImp::GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sS
     DispatchEvent(&checkWordEvent);

     return suggestWordsEvent.bSuggestWords;

 }

-FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace)

+FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace)

 {

     int32_t nWordCount = 0;

     int32_t nWordStart = GetWordAtPoint(pointf, nWordCount);

@@ -820,7 +820,7 @@ FX_BOOL CFWL_EditImp::Delete()
     m_pEdtEngine->Delete(0);

     return TRUE;

 }

-FX_BOOL CFWL_EditImp::Redo(FX_BSTR bsRecord)

+FX_BOOL CFWL_EditImp::Redo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FALSE);

     if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_NoRedoUndo) {

@@ -828,7 +828,7 @@ FX_BOOL CFWL_EditImp::Redo(FX_BSTR bsRecord)
     }

     return m_pEdtEngine->Redo(bsRecord);

 }

-FX_BOOL CFWL_EditImp::Undo(FX_BSTR bsRecord)

+FX_BOOL CFWL_EditImp::Undo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FALSE);

     if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_NoRedoUndo) {

@@ -989,7 +989,7 @@ FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine *pEdit, int32_t nPageIndex
     pPage->UnloadPage();

     return TRUE;

 }

-void CFWL_EditImp::On_AddDoRecord(IFDE_TxtEdtEngine *pEdit, FX_BSTR bsDoRecord)

+void CFWL_EditImp::On_AddDoRecord(IFDE_TxtEdtEngine *pEdit, const CFX_ByteStringC& bsDoRecord)

 {

     AddDoRecord(bsDoRecord);

     CFWL_WidgetImp *pSrcTarget = GetRootOuter();

@@ -1533,7 +1533,7 @@ FX_BOOL	CFWL_EditImp::IsContentHeightOverflow()
     _FWL_RETURN_VALUE_IF_FAIL(pPage, FALSE);

     return pPage->GetContentsBox().height > m_rtEngine.height + 1.0f;

 }

-int32_t CFWL_EditImp::AddDoRecord(FX_BSTR bsDoRecord)

+int32_t CFWL_EditImp::AddDoRecord(const CFX_ByteStringC& bsDoRecord)

 {

     int32_t nCount = m_RecordArr.GetSize();

     if (m_iCurRecord == nCount - 1) {

diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp
index 66714fcec7..6ecfeeeb0f 100644
--- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp
@@ -31,7 +31,7 @@ FX_DWORD CFWL_FormProxyImp::GetClassID() const
 {

     return FWL_CLASSHASH_FormProxy;

 }

-FX_BOOL CFWL_FormProxyImp::IsInstance(FX_WSTR wsClass) const

+FX_BOOL CFWL_FormProxyImp::IsInstance(const CFX_WideStringC& wsClass) const

 {

     if (wsClass == CFX_WideStringC(FWL_CLASS_FormProxy)) {

         return TRUE;

diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp
index 7996a882f5..caa811a345 100644
--- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp
@@ -79,7 +79,7 @@ FX_BOOL CFX_Barcode::SetWidth(int32_t width)
 {

     return m_pBCEngine ? m_pBCEngine->SetWidth(width) : FALSE;

 }

-FX_BOOL	CFX_Barcode::CheckContentValidity(FX_WSTR contents)

+FX_BOOL	CFX_Barcode::CheckContentValidity(const CFX_WideStringC& contents)

 {

     switch(GetType()) {

         case BC_CODE39:

@@ -336,7 +336,7 @@ FX_BOOL	CFX_Barcode::SetTruncated(FX_BOOL truncated)
 #ifndef BCExceptionUnSupportedBarcode

 #define	BCExceptionUnSupportedBarcode							          18

 #endif

-FX_BOOL CFX_Barcode::Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e)

+FX_BOOL CFX_Barcode::Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e)

 {

     if(!m_pBCEngine) {

         return FALSE;

diff --git a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
index 5046cdf47b..059e657182 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
@@ -103,8 +103,8 @@ public:
     virtual int32_t	GetEditLimit();

     virtual FWL_ERR		SetEditLimit(int32_t nLimit);

     virtual FWL_ERR		EditDoClipboard(int32_t iCmd);

-    virtual FX_BOOL		EditRedo(FX_BSTR bsRecord);

-    virtual FX_BOOL		EditUndo(FX_BSTR bsRecord);

+    virtual FX_BOOL		EditRedo(const CFX_ByteStringC& bsRecord);

+    virtual FX_BOOL		EditUndo(const CFX_ByteStringC& bsRecord);

     virtual IFWL_ListBox*  GetListBoxt();

     virtual FX_BOOL AfterFocusShowDropList();

     virtual FX_ERR	OpenDropDownList(FX_BOOL bActivate);

diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index e06cfa8d67..3f5f7c0218 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
@@ -55,8 +55,8 @@ public:
     virtual FX_BOOL		Cut(CFX_WideString &wsCut);

     virtual FX_BOOL		Paste(const CFX_WideString &wsPaste);

     virtual FX_BOOL		Delete();

-    virtual FX_BOOL		Redo(FX_BSTR bsRecord);

-    virtual FX_BOOL		Undo(FX_BSTR bsRecord);

+    virtual FX_BOOL		Redo(const CFX_ByteStringC& bsRecord);

+    virtual FX_BOOL		Undo(const CFX_ByteStringC& bsRecord);

     virtual FX_BOOL		Undo();

     virtual FX_BOOL		Redo();

     virtual FX_BOOL		CanUndo();

@@ -74,7 +74,7 @@ public:
     {

         return TRUE;

     }

-    virtual void		On_AddDoRecord(IFDE_TxtEdtEngine *pEdit, FX_BSTR bsDoRecord);

+    virtual void		On_AddDoRecord(IFDE_TxtEdtEngine *pEdit, const CFX_ByteStringC& bsDoRecord);

     virtual FX_BOOL		On_ValidateField(IFDE_TxtEdtEngine *pEdit, int32_t nBlockIndex, int32_t nFieldIndex, \

                                          const CFX_WideString &wsFieldText, int32_t nCharIndex);

     virtual FX_BOOL		On_ValidateBlock(IFDE_TxtEdtEngine *pEdit, int32_t nBlockIndex);

@@ -84,7 +84,7 @@ public:
     virtual FWL_ERR     SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize);

     void				SetScrollOffset(FX_FLOAT fScrollOffset);

     FX_BOOL				GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest);

-    FX_BOOL				ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace);

+    FX_BOOL				ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace);

 protected:

     void				DrawTextBk(CFX_Graphics *pGraphics, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);

     void				DrawContent(CFX_Graphics *pGraphics, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);

@@ -107,7 +107,7 @@ protected:
     void				ClearRecord();

     FX_BOOL				IsShowScrollBar(FX_BOOL bVert);

     FX_BOOL				IsContentHeightOverflow();

-    int32_t			AddDoRecord(FX_BSTR bsDoRecord);

+    int32_t			AddDoRecord(const CFX_ByteStringC& bsDoRecord);

     void				ProcessInsertError(int32_t iError);

 

     void				DrawSpellCheck(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);

diff --git a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
index e582f8c0e6..30d2c1f21f 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h
@@ -20,7 +20,7 @@ public:
     ~CFWL_FormProxyImp();

     virtual FWL_ERR		GetClassName(CFX_WideString &wsClass) const;

     virtual FX_DWORD	GetClassID() const;

-    virtual FX_BOOL		IsInstance(FX_WSTR wsClass) const;

+    virtual FX_BOOL		IsInstance(const CFX_WideStringC& wsClass) const;

     virtual FWL_ERR		Initialize();

     virtual FWL_ERR		Finalize();

     virtual	FWL_ERR		Update();

diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index 0c4e38dd9e..ea8be75702 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -14,7 +14,7 @@ public:
     FX_BOOL					Crreate(BC_TYPE type);

     virtual void			Release();

     virtual BC_TYPE			GetType();

-    virtual FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    virtual FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     virtual FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     virtual FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     virtual CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode);

@@ -24,7 +24,7 @@ public:
     virtual FX_BOOL			SetModuleWidth(int32_t moduleWidth);

     virtual FX_BOOL			SetHeight(int32_t height);

     virtual FX_BOOL			SetWidth(int32_t width);

-    virtual FX_BOOL			CheckContentValidity(FX_WSTR contents);

+    virtual FX_BOOL			CheckContentValidity(const CFX_WideStringC& contents);

     virtual FX_BOOL			SetPrintChecksum(FX_BOOL checksum);

     virtual FX_BOOL			SetDataLength(int32_t length);

     virtual FX_BOOL			SetCalChecksum(int32_t state);

diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp
index db78afa369..36838548e4 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_formimp.cpp
@@ -154,7 +154,7 @@ FX_DWORD CFWL_FormImp::GetClassID() const
 {

     return FWL_CLASSHASH_Form;

 }

-FX_BOOL	CFWL_FormImp::IsInstance(FX_WSTR wsClass) const

+FX_BOOL	CFWL_FormImp::IsInstance(const CFX_WideStringC& wsClass) const

 {

     if (wsClass == CFX_WideStringC(FWL_CLASS_Form)) {

         return TRUE;

diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
index 2fdaee126e..bebad3c331 100644
--- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
@@ -79,7 +79,7 @@ FWL_ERR		CFWL_SDAdapterWidgetMgr::SetWidgetIcon(IFWL_Widget *pWidget, const CFX_
 {

     return FWL_ERR_Succeeded;

 }

-FWL_ERR		CFWL_SDAdapterWidgetMgr::SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption)

+FWL_ERR		CFWL_SDAdapterWidgetMgr::SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption)

 {

     return FWL_ERR_Succeeded;

 }

diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp
index c09b8ee447..c6ffd27a22 100644
--- a/xfa/src/fwl/src/core/fwl_targetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp
@@ -31,7 +31,7 @@ FX_DWORD IFWL_Target::GetClassID() const
 {

     return ((CFWL_Target*)m_pData)->GetClassID();

 }

-FX_BOOL	IFWL_Target::IsInstance(FX_WSTR wsClass) const

+FX_BOOL	IFWL_Target::IsInstance(const CFX_WideStringC& wsClass) const

 {

     return ((CFWL_Target*)m_pData)->IsInstance(wsClass);

 }

@@ -79,7 +79,7 @@ FX_DWORD CFWL_Target::GetClassID() const
 {

     return 0;

 }

-FX_BOOL	CFWL_Target::IsInstance(FX_WSTR wsClass) const

+FX_BOOL	CFWL_Target::IsInstance(const CFX_WideStringC& wsClass) const

 {

     return FALSE;

 }

diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
index 4a89951d7d..51988dd9cd 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
@@ -422,7 +422,7 @@ FWL_ERR	CFWL_WidgetMgr::SetWidgetIcon_Native(IFWL_Widget *pWidget, const CFX_DIB
 {

     return m_pAdapter->SetWidgetIcon(pWidget, pIcon, bBig);

 }

-FWL_ERR	CFWL_WidgetMgr::SetWidgetCaption_Native(IFWL_Widget *pWidget, FX_WSTR wsCaption)

+FWL_ERR	CFWL_WidgetMgr::SetWidgetCaption_Native(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption)

 {

     return m_pAdapter->SetWidgetCaption(pWidget, wsCaption);

 }

diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h
index 0cf9c9d25c..f0cee13000 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_formimp.h
@@ -90,7 +90,7 @@ public:
     virtual ~CFWL_FormImp();

     virtual FWL_ERR			GetClassName(CFX_WideString &wsClass) const;

     virtual FX_DWORD		GetClassID() const;

-    virtual FX_BOOL			IsInstance(FX_WSTR wsClass) const;

+    virtual FX_BOOL			IsInstance(const CFX_WideStringC& wsClass) const;

     virtual FWL_ERR			Initialize();

     virtual FWL_ERR			Finalize();

 

diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h
index 1287a63870..3b0b7c38a6 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h
@@ -15,7 +15,7 @@ public:
     virtual	FX_DWORD		GetRefCount() const;

     virtual FWL_ERR			GetClassName(CFX_WideString &wsClass) const;

     virtual FX_DWORD		GetClassID() const;

-    virtual FX_BOOL			IsInstance(FX_WSTR wsClass) const;

+    virtual FX_BOOL			IsInstance(const CFX_WideStringC& wsClass) const;

     virtual FWL_ERR			Initialize();

     virtual FWL_ERR			Finalize();

 protected:

diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index 12b629ff06..f9b465fc52 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -77,7 +77,7 @@ public:
     FWL_ERR			SetWidgetRect_Native(IFWL_Widget *pWidget, const CFX_RectF &rect);

     FWL_ERR			SetWidgetPosition_Native(IFWL_Widget *pWidget, FX_FLOAT fx, FX_FLOAT fy);

     FWL_ERR			SetWidgetIcon_Native(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig);

-    FWL_ERR			SetWidgetCaption_Native(IFWL_Widget *pWidget, FX_WSTR wsCaption);

+    FWL_ERR			SetWidgetCaption_Native(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption);

     FWL_ERR			SetBorderRegion_Native(IFWL_Widget *pWidget, CFX_Path *pPath);

     FWL_ERR			ShowWidget_Native(IFWL_Widget *pWidget);

     FWL_ERR			HideWidget_Native(IFWL_Widget *pWidget);

diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp
index 298aa41b4e..5079159d48 100644
--- a/xfa/src/fwl/src/lightwidget/checkbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp
@@ -35,7 +35,7 @@ FWL_ERR	CFWL_CheckBox::Initialize(const CFWL_WidgetProperties *pProperties )
     }

     return ret;

 }

-FWL_ERR CFWL_CheckBox::SetCaption(FX_WSTR wsCaption)

+FWL_ERR CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption)

 {

     m_checkboxData.m_wsCaption = wsCaption;

     return FWL_ERR_Succeeded;

diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp
index c0806ef15b..20211caa72 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/src/lightwidget/combobox.cpp
@@ -35,14 +35,14 @@ FWL_ERR	CFWL_ComboBox::Initialize(const CFWL_WidgetProperties *pProperties )
     }

     return ret;

 }

-int32_t CFWL_ComboBox::AddString(FX_WSTR wsText)

+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText)

 {

     CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;

     pItem->m_wsText = wsText;

     pItem->m_dwStyles = 0;

     return m_comboBoxData.m_arrItem.Add(pItem);

 }

-int32_t CFWL_ComboBox::AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon)

+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon)

 {

     CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;

     pItem->m_wsText = wsText;

@@ -80,7 +80,7 @@ FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_ComboBox*)m_pImp)->SetCurSel(iSel);

 }

-FWL_ERR CFWL_ComboBox::SetEditText(FX_WSTR wsText)

+FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_ComboBox*)m_pImp)->SetEditText(wsText);

@@ -120,12 +120,12 @@ FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_ComboBox*)m_pImp)->EditDoClipboard(iCmd);

 }

-FX_BOOL CFWL_ComboBox::EditRedo(FX_BSTR bsRecord)

+FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return ((IFWL_ComboBox*)m_pImp)->EditRedo(bsRecord);

 }

-FX_BOOL CFWL_ComboBox::EditUndo(FX_BSTR bsRecord)

+FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return ((IFWL_ComboBox*)m_pImp)->EditUndo(bsRecord);

diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
index 5a18efe542..ee64d09d7c 100644
--- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
+++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
@@ -54,7 +54,7 @@ FWL_ERR	CFWL_DateTimePicker::GetEditText(CFX_WideString &wsText)
 {

     return ((IFWL_DateTimePicker*)m_pImp)->GetEditText(wsText);

 }

-FWL_ERR	CFWL_DateTimePicker::SetEditText(FX_WSTR wsText)

+FWL_ERR	CFWL_DateTimePicker::SetEditText(const CFX_WideStringC& wsText)

 {

     return ((IFWL_DateTimePicker*)m_pImp)->SetEditText(wsText);

 }

diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp
index 1ee1066793..310e68ba2f 100644
--- a/xfa/src/fwl/src/lightwidget/edit.cpp
+++ b/xfa/src/fwl/src/lightwidget/edit.cpp
@@ -142,12 +142,12 @@ FWL_ERR CFWL_Edit::DoClipboard(int32_t iCmd)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_Edit*)m_pImp)->DoClipboard(iCmd);

 }

-FX_BOOL CFWL_Edit::Redo(FX_BSTR bsRecord)

+FX_BOOL CFWL_Edit::Redo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return ((IFWL_Edit*)m_pImp)->Redo(bsRecord);

 }

-FX_BOOL CFWL_Edit::Undo(FX_BSTR bsRecord)

+FX_BOOL CFWL_Edit::Undo(const CFX_ByteStringC& bsRecord)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return ((IFWL_Edit*)m_pImp)->Undo(bsRecord);

@@ -214,7 +214,7 @@ FX_BOOL CFWL_Edit::GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSugg
 {

     return ((IFWL_Edit*)m_pImp)->GetSuggestWords(pointf, sSuggest);

 }

-FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace)

+FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace)

 {

     return ((IFWL_Edit*)m_pImp)->ReplaceSpellCheckWord(pointf, bsReplace);

 }

diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp
index a9890bd283..c96e368ca4 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/listbox.cpp
@@ -40,7 +40,7 @@ FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap *pDIB, FWL_HLISTITEM hItem)
     ((CFWL_ListItem*)hItem)->m_pDIB = pDIB;

     return FWL_ERR_Succeeded;

 }

-FWL_HLISTITEM CFWL_ListBox::AddString(FX_WSTR wsAdd, FX_BOOL bSelect)

+FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd, FX_BOOL bSelect)

 {

     CFWL_ListItem * pItem = FX_NEW CFWL_ListItem;

     pItem->m_dwStates = 0;

@@ -149,7 +149,7 @@ FWL_HLISTITEM CFWL_ListBox::GetItem(int32_t nIndex)
     }

     return (FWL_HLISTITEM)m_ListBoxDP.m_arrItem[nIndex];

 }

-FWL_ERR	CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText)

+FWL_ERR	CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem, const CFX_WideStringC& wsText)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

     CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
index 7e4cae2d18..f09c3cd2fe 100644
--- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp
+++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
@@ -40,7 +40,7 @@ FWL_ERR CFWL_PushButton::GetCaption(CFX_WideString &wsCaption)
     wsCaption = m_buttonData.m_wsCaption;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR CFWL_PushButton::SetCaption(FX_WSTR wsCaption)

+FWL_ERR CFWL_PushButton::SetCaption(const CFX_WideStringC& wsCaption)

 {

     m_buttonData.m_wsCaption = wsCaption;

     return FWL_ERR_Succeeded;

diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
index 5fc3d5a4f3..7491e6be38 100644
--- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
+++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
@@ -46,7 +46,7 @@ FWL_ERR CFWL_ToolTip::GetCaption(CFX_WideString &wsCaption)
     wsCaption = m_tooltipData.m_wsCaption;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR CFWL_ToolTip::SetCaption(FX_WSTR wsCaption)

+FWL_ERR CFWL_ToolTip::SetCaption(const CFX_WideStringC& wsCaption)

 {

     m_tooltipData.m_wsCaption = wsCaption;

     return FWL_ERR_Succeeded;

diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp
index b1cbd9ae9e..be6c728e2c 100644
--- a/xfa/src/fwl/src/lightwidget/widget.cpp
+++ b/xfa/src/fwl/src/lightwidget/widget.cpp
@@ -49,7 +49,7 @@ FX_DWORD CFWL_Widget::GetClassID() const
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

     return m_pImp->GetClassID();

 }

-FX_BOOL CFWL_Widget::IsInstance(FX_WSTR wsClass) const

+FX_BOOL CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return m_pImp->IsInstance(wsClass);

diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp
index a4c876956d..7ce08abb27 100644
--- a/xfa/src/fwl/src/theme/widgettp.cpp
+++ b/xfa/src/fwl/src/theme/widgettp.cpp
@@ -688,11 +688,11 @@ CFWL_FontData::~CFWL_FontData()
     }

 #endif

 }

-FX_BOOL CFWL_FontData::Equal(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage)

+FX_BOOL CFWL_FontData::Equal(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage)

 {

     return m_wsFamily == wsFontFamily && m_dwStyles == dwFontStyles && m_dwCodePage == wCodePage;

 }

-FX_BOOL CFWL_FontData::LoadFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage)

+FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage)

 {

     m_wsFamily = wsFontFamily;

     m_dwStyles = dwFontStyles;

@@ -720,7 +720,7 @@ CFWL_FontManager::~CFWL_FontManager()
     }

     m_arrFonts.RemoveAll();

 }

-IFX_Font* CFWL_FontManager::FindFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage)

+IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage)

 {

     int32_t count = m_arrFonts.GetSize();

     for (int32_t i = 0; i < count; i ++) {