From fc58ad18b7ab32e7b0bb3959b07dbe7538a7cebd Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 5 Apr 2016 12:22:15 -0700 Subject: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. Companion to https://codereview.chromium.org/1853233002 BUG= Review URL: https://codereview.chromium.org/1857073002 --- xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp | 4 ++-- xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fxbarcode/oned') diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 81f0339aa8..3fbeb1c318 100644 --- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -226,6 +226,6 @@ void CBC_OnedCodaBarWriter::RenderResult(const CFX_WideStringC& contents, int32_t codeLength, FX_BOOL isDevice, int32_t& e) { - CBC_OneDimWriter::RenderResult(encodedContents(contents), code, codeLength, - isDevice, e); + CBC_OneDimWriter::RenderResult(encodedContents(contents).AsWideStringC(), + code, codeLength, isDevice, e); } diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp index 31e75ca7df..0a69f04a4f 100644 --- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -360,5 +360,6 @@ void CBC_OnedCode39Writer::RenderResult(const CFX_WideStringC& contents, int32_t& e) { CFX_WideString encodedCon = encodedContents(contents, e); BC_EXCEPTION_CHECK_ReturnVoid(e); - CBC_OneDimWriter::RenderResult(encodedCon, code, codeLength, isDevice, e); + CBC_OneDimWriter::RenderResult(encodedCon.AsWideStringC(), code, codeLength, + isDevice, e); } -- cgit v1.2.3