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/fwl/basewidget/fwl_barcodeimp.cpp | 2 +- xfa/fwl/basewidget/fwl_editimp.cpp | 2 +- xfa/fwl/core/fwl_formimp.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp index 9b6761bf8d..610233e84e 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp @@ -170,7 +170,7 @@ void CFWL_BarcodeImp::GenerateBarcodeImageCache() { m_pBarcodeEngine->SetTruncated(pData->GetTruncated()); } int32_t errorCode = 0; - m_dwStatus = m_pBarcodeEngine->Encode(wsText, TRUE, errorCode) + m_dwStatus = m_pBarcodeEngine->Encode(wsText.AsWideStringC(), TRUE, errorCode) ? XFA_BCS_EncodeSuccess : 0; } diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 008936c90e..fb25c1e0fc 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -423,7 +423,7 @@ FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, pBuffer[i] = bsReplace[i]; } wsDest.ReleaseBuffer(nDestLen); - Replace(nWordStart, nWordCount, wsDest); + Replace(nWordStart, nWordCount, wsDest.AsWideStringC()); return TRUE; } void CFWL_EditImp::DrawSpellCheck(CFX_Graphics* pGraphics, diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp index f7fc301d97..5a5cc5e59b 100644 --- a/xfa/fwl/core/fwl_formimp.cpp +++ b/xfa/fwl/core/fwl_formimp.cpp @@ -822,7 +822,7 @@ void CFWL_FormImp::UpdateCaption() { return; CFX_WideString text; pData->GetCaption(m_pInterface, text); - pWidgetMgr->SetWidgetCaption_Native(m_pInterface, text); + pWidgetMgr->SetWidgetCaption_Native(m_pInterface, text.AsWideStringC()); } void CFWL_FormImp::DoWidthLimit(FX_FLOAT& fLeft, FX_FLOAT& fWidth, -- cgit v1.2.3