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_OnedCodaBarWriter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp') diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 0049a54f7c..584f7bf1d8 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -103,7 +103,7 @@ FX_BOOL CBC_OnedCodaBarWriter::FindChar(FX_WCHAR ch, FX_BOOL isContent) return FALSE; } } -FX_BOOL CBC_OnedCodaBarWriter::CheckContentValidity(FX_WSTR contents) +FX_BOOL CBC_OnedCodaBarWriter::CheckContentValidity(const CFX_WideStringC& contents) { FX_WCHAR ch; int32_t index = 0; @@ -117,7 +117,7 @@ FX_BOOL CBC_OnedCodaBarWriter::CheckContentValidity(FX_WSTR contents) } return TRUE; } -CFX_WideString CBC_OnedCodaBarWriter::FilterContents(FX_WSTR contents) +CFX_WideString CBC_OnedCodaBarWriter::FilterContents(const CFX_WideStringC& contents) { CFX_WideString filtercontents; FX_WCHAR ch; @@ -210,13 +210,13 @@ uint8_t* CBC_OnedCodaBarWriter::Encode(const CFX_ByteString &contents, int32_t & outLength = position; return result; } -CFX_WideString CBC_OnedCodaBarWriter::encodedContents(FX_WSTR contents) +CFX_WideString CBC_OnedCodaBarWriter::encodedContents(const CFX_WideStringC& contents) { CFX_WideString strStart(m_chStart); CFX_WideString strEnd(m_chEnd); return strStart + contents + strEnd; } -void CBC_OnedCodaBarWriter::RenderResult(FX_WSTR contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e) +void CBC_OnedCodaBarWriter::RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e) { CBC_OneDimWriter::RenderResult(encodedContents(contents), code, codeLength, isDevice, e); } -- cgit v1.2.3