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/fwl/lightwidget/edit.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/include/fwl/lightwidget/edit.h') diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 94a4ac48e4..06c10728b0 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -34,8 +34,8 @@ public: FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace); FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace); FWL_ERR DoClipboard(int32_t iCmd); - 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); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); FWL_ERR SetBackColor(FX_DWORD dwColor); @@ -50,7 +50,7 @@ public: FX_BOOL Delete(); 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); CFWL_Edit(); virtual ~CFWL_Edit(); }; -- cgit v1.2.3