Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: xfa/fxfa/parser/xfa_basic_imp.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: win error #2 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fxfa/parser/cxfa_widgetdata.cpp ('k') | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxfa/parser/xfa_basic_imp.h" 7 #include "xfa/fxfa/parser/xfa_basic_imp.h"
8 8
9 #include "core/fxcrt/include/fx_ext.h" 9 #include "core/fxcrt/include/fx_ext.h"
10 #include "xfa/fgas/crt/fgas_algorithm.h" 10 #include "xfa/fgas/crt/fgas_algorithm.h"
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 FX_BOOL CXFA_WideTextRead::IsEOF() const { 592 FX_BOOL CXFA_WideTextRead::IsEOF() const {
593 return m_iPosition >= m_wsBuffer.GetLength(); 593 return m_iPosition >= m_wsBuffer.GetLength();
594 } 594 }
595 int32_t CXFA_WideTextRead::ReadString(FX_WCHAR* pStr, 595 int32_t CXFA_WideTextRead::ReadString(FX_WCHAR* pStr,
596 int32_t iMaxLength, 596 int32_t iMaxLength,
597 FX_BOOL& bEOS, 597 FX_BOOL& bEOS,
598 int32_t const* pByteSize) { 598 int32_t const* pByteSize) {
599 if (iMaxLength > m_wsBuffer.GetLength() - m_iPosition) { 599 if (iMaxLength > m_wsBuffer.GetLength() - m_iPosition) {
600 iMaxLength = m_wsBuffer.GetLength() - m_iPosition; 600 iMaxLength = m_wsBuffer.GetLength() - m_iPosition;
601 } 601 }
602 FXSYS_wcsncpy(pStr, (const FX_WCHAR*)m_wsBuffer + m_iPosition, iMaxLength); 602 FXSYS_wcsncpy(pStr, m_wsBuffer.c_str() + m_iPosition, iMaxLength);
603 m_iPosition += iMaxLength; 603 m_iPosition += iMaxLength;
604 bEOS = IsEOF(); 604 bEOS = IsEOF();
605 return iMaxLength; 605 return iMaxLength;
606 } 606 }
607 uint16_t CXFA_WideTextRead::GetCodePage() const { 607 uint16_t CXFA_WideTextRead::GetCodePage() const {
608 return (sizeof(FX_WCHAR) == 2) ? FX_CODEPAGE_UTF16LE : FX_CODEPAGE_UTF32LE; 608 return (sizeof(FX_WCHAR) == 2) ? FX_CODEPAGE_UTF16LE : FX_CODEPAGE_UTF32LE;
609 } 609 }
610 uint16_t CXFA_WideTextRead::SetCodePage(uint16_t wCodePage) { 610 uint16_t CXFA_WideTextRead::SetCodePage(uint16_t wCodePage) {
611 return GetCodePage(); 611 return GetCodePage();
612 } 612 }
OLDNEW
« no previous file with comments | « xfa/fxfa/parser/cxfa_widgetdata.cpp ('k') | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698