From 28f97ff783c16f3391384ce97b765ce4eb310ac7 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 4 Apr 2016 16:41:35 -0700 Subject: Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC. Having this happen implicitly can be dangerous because the lifetime has to be considered; we should have caught the "red bots" in https://codereview.chromium.org/1847333004/#ps60001 at compile time. Review URL: https://codereview.chromium.org/1853233002 --- xfa/fwl/basewidget/fwl_editimp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index d5aa2c0507..008936c90e 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -734,14 +734,14 @@ FX_BOOL CFWL_EditImp::Undo() { return FALSE; } CFX_ByteString bsRecord = m_RecordArr[m_iCurRecord--]; - return Undo(bsRecord); + return Undo(bsRecord.AsByteStringC()); } FX_BOOL CFWL_EditImp::Redo() { if (!CanRedo()) { return FALSE; } CFX_ByteString bsRecord = m_RecordArr[++m_iCurRecord]; - return Redo(bsRecord); + return Redo(bsRecord.AsByteStringC()); } FX_BOOL CFWL_EditImp::CanUndo() { return m_iCurRecord >= 0; -- cgit v1.2.3