3 files changed, 7 insertions, 7 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h
index 950189bbba..ddccd6bea3 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/include/fwl/basewidget/fwl_combobox.h
@@ -112,8 +112,8 @@ public:
     int32_t	GetEditLimit();
     FWL_ERR		SetEditLimit(int32_t nLimit);
     FWL_ERR		EditDoClipboard(int32_t iCmd);
-    FX_BOOL		EditRedo(FX_BSTR bsRecord);
-    FX_BOOL		EditUndo(FX_BSTR bsRecord);
+    FX_BOOL		EditRedo(const CFX_ByteStringC& bsRecord);
+    FX_BOOL		EditUndo(const CFX_ByteStringC& bsRecord);
     IFWL_ListBox*	GetListBoxt();
     FX_BOOL		AfterFocusShowDropList();
     FX_ERR		OpenDropDownList(FX_BOOL bActivate);
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index ae8aea0bd3..82b0055322 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -144,8 +144,8 @@ public:
     FX_BOOL	Cut(CFX_WideString &wsCut);
     FX_BOOL	Paste(const CFX_WideString &wsPaste);
     FX_BOOL	Delete();
-    FX_BOOL	Redo(FX_BSTR bsRecord);
-    FX_BOOL	Undo(FX_BSTR bsRecord);
+    FX_BOOL	Redo(const CFX_ByteStringC& bsRecord);
+    FX_BOOL	Undo(const CFX_ByteStringC& bsRecord);
     FX_BOOL	Undo();
     FX_BOOL	Redo();
     FX_BOOL	CanUndo();
@@ -157,7 +157,7 @@ public:
     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:
     IFWL_Edit();
     virtual ~IFWL_Edit();
diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h
index 3fcd341892..15babc8253 100644
--- a/xfa/include/fwl/basewidget/fxmath_barcode.h
+++ b/xfa/include/fwl/basewidget/fxmath_barcode.h
@@ -11,7 +11,7 @@ class IFX_Barcode
 public:
     virtual void			Release() = 0;
     virtual BC_TYPE			GetType() = 0;
-    virtual FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
+    virtual FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e) = 0;
     virtual FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
     virtual FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
     virtual CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode) = 0;
@@ -21,7 +21,7 @@ public:
     virtual FX_BOOL			SetModuleWidth(int32_t moduleWidth) = 0;
     virtual FX_BOOL			SetHeight(int32_t height) = 0;
     virtual FX_BOOL			SetWidth(int32_t width) = 0;
-    virtual FX_BOOL			CheckContentValidity(FX_WSTR contents) = 0;
+    virtual FX_BOOL			CheckContentValidity(const CFX_WideStringC& contents) = 0;
     virtual FX_BOOL			SetPrintChecksum(FX_BOOL checksum) = 0;
     virtual FX_BOOL			SetDataLength(int32_t length) = 0;
     virtual FX_BOOL			SetCalChecksum(int32_t state) = 0;