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/src/fxbarcode/oned/BC_OnedCode39Writer.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h') diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h index 641d041809..679d4f6ae7 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h @@ -18,14 +18,14 @@ public: uint8_t *Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e); uint8_t *Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e); uint8_t *Encode(const CFX_ByteString &contents, int32_t &outLength, int32_t &e); - void RenderResult(FX_WSTR contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e); - CFX_WideString encodedContents(FX_WSTR contents, int32_t &e); - FX_BOOL CheckContentValidity(FX_WSTR contents); - FX_BOOL CheckExtendedContentValidity(FX_WSTR contents); - CFX_WideString FilterContents(FX_WSTR contents); - CFX_WideString FilterExtendedContents(FX_WSTR contents); - CFX_WideString RenderTextContents(FX_WSTR contents); - CFX_WideString RenderExtendedTextContents(FX_WSTR contents); + void RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e); + CFX_WideString encodedContents(const CFX_WideStringC& contents, int32_t &e); + FX_BOOL CheckContentValidity(const CFX_WideStringC& contents); + FX_BOOL CheckExtendedContentValidity(const CFX_WideStringC& contents); + CFX_WideString FilterContents(const CFX_WideStringC& contents); + CFX_WideString FilterExtendedContents(const CFX_WideStringC& contents); + CFX_WideString RenderTextContents(const CFX_WideStringC& contents); + CFX_WideString RenderExtendedTextContents(const CFX_WideStringC& contents); FX_BOOL SetTextLocation(BC_TEXT_LOC loction); FX_BOOL SetWideNarrowRatio(int32_t ratio); private: -- cgit v1.2.3