diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
| commit | b208774174e102da9f218d89bf8a3af7a0e37f09 (patch) | |
| tree | b2f345fb8c42b54008af9e06bcde1cfeff380acb /core/src/fxcrt/fx_basic_buffer.cpp | |
| parent | 8f608d9c0d09ab5fc19cfb4a9d5d8ccef3de6625 (diff) | |
| download | pdfium-b208774174e102da9f218d89bf8a3af7a0e37f09.tar.xz | |
Merge to XFA: Add missing operators for CFX_xxxString combo patch.
This pulls in:
Review URL: https://codereview.chromium.org/1099193002
Review URL: https://codereview.chromium.org/1090303003
Review URL: https://codereview.chromium.org/1084293003
Review URL: https://codereview.chromium.org/1099213002
Plus one fix to an XFA file to fix compilation.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1095893005
Diffstat (limited to 'core/src/fxcrt/fx_basic_buffer.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_buffer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/src/fxcrt/fx_basic_buffer.cpp index bb8466debe..eb5246acec 100644 --- a/core/src/fxcrt/fx_basic_buffer.cpp +++ b/core/src/fxcrt/fx_basic_buffer.cpp @@ -143,7 +143,7 @@ CFX_ByteStringC CFX_BinaryBuf::GetByteString() const } CFX_ByteTextBuf& CFX_ByteTextBuf::operator << (FX_BSTR lpsz) { - AppendBlock((FX_LPCBYTE)lpsz, lpsz.GetLength()); + AppendBlock(lpsz.GetPtr(), lpsz.GetLength()); return *this; } CFX_ByteTextBuf& CFX_ByteTextBuf::operator << (int i) @@ -174,7 +174,7 @@ CFX_ByteTextBuf& CFX_ByteTextBuf::operator << (const CFX_ByteTextBuf& buf) } void CFX_ByteTextBuf::operator =(const CFX_ByteStringC& str) { - CopyData((FX_LPCBYTE)str, str.GetLength()); + CopyData(str.GetPtr(), str.GetLength()); } void CFX_WideTextBuf::AppendChar(FX_WCHAR ch) { @@ -285,10 +285,10 @@ CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (FX_BSTR bstr) int len = bstr.GetLength(); if (m_pStream) { m_pStream->WriteBlock(&len, sizeof(int)); - m_pStream->WriteBlock(bstr, len); + m_pStream->WriteBlock(bstr.GetPtr(), len); } else { m_SavingBuf.AppendBlock(&len, sizeof(int)); - m_SavingBuf.AppendBlock(bstr, len); + m_SavingBuf.AppendBlock(bstr.GetPtr(), len); } return *this; } @@ -488,7 +488,7 @@ FX_INT32 IFX_BufferArchive::AppendDWord(FX_DWORD i) } FX_INT32 IFX_BufferArchive::AppendString(FX_BSTR lpsz) { - return AppendBlock((FX_LPCBYTE)lpsz, lpsz.GetLength()); + return AppendBlock(lpsz.GetPtr(), lpsz.GetLength()); } CFX_FileBufferArchive::CFX_FileBufferArchive(FX_STRSIZE size) : IFX_BufferArchive(size) |