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 /xfa/src | |
| 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 'xfa/src')
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index cdbe2ad85b..f275780952 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -1046,7 +1046,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) return;
}
pStream->SetCodePage(FX_CODEPAGE_UTF8);
- pStream->WriteData(bsXMLHeader, bsXMLHeader.GetLength());
+ pStream->WriteData(bsXMLHeader.GetPtr(), bsXMLHeader.GetLength());
XFA_DataExporter_RegenerateFormFile(this, pStream, NULL, TRUE);
FXJSE_Value_SetUTF8String(pArguments->GetReturnValue(), CFX_ByteStringC(pMemoryStream->GetBuffer(), pMemoryStream->GetSize()));
pStream->Release();
@@ -1072,7 +1072,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) IFX_Stream *pStream = IFX_Stream::CreateStream((IFX_FileWrite*)pMemoryStream, FX_STREAMACCESS_Text | FX_STREAMACCESS_Write | FX_STREAMACCESS_Append);
if (pStream) {
pStream->SetCodePage(FX_CODEPAGE_UTF8);
- pStream->WriteData(bsXMLHeader, bsXMLHeader.GetLength());
+ pStream->WriteData(bsXMLHeader.GetPtr(), bsXMLHeader.GetLength());
pElement->SaveXMLNode(pStream);
FXJSE_Value_SetUTF8String(pArguments->GetReturnValue(), CFX_ByteStringC(pMemoryStream->GetBuffer(), pMemoryStream->GetSize()));
pStream->Release();
|