diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/fde/xml/fde_xml_imp.cpp | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz | |
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'xfa/fde/xml/fde_xml_imp.cpp')
| -rw-r--r-- | xfa/fde/xml/fde_xml_imp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/xml/fde_xml_imp.cpp b/xfa/fde/xml/fde_xml_imp.cpp index 731f88db40..3e0c87f821 100644 --- a/xfa/fde/xml/fde_xml_imp.cpp +++ b/xfa/fde/xml/fde_xml_imp.cpp @@ -388,7 +388,7 @@ void CFDE_XMLNode::SaveXMLNode(IFX_Stream* pXMLStream) { CFDE_XMLInstruction* pInstruction = (CFDE_XMLInstruction*)pNode; if (pInstruction->m_wsTarget.CompareNoCase(L"xml") == 0) { ws = L"<?xml version=\"1.0\" encoding=\""; - FX_WORD wCodePage = pXMLStream->GetCodePage(); + uint16_t wCodePage = pXMLStream->GetCodePage(); if (wCodePage == FX_CODEPAGE_UTF16LE) { ws += L"UTF-16"; } else if (wCodePage == FX_CODEPAGE_UTF16BE) { @@ -914,7 +914,7 @@ FX_BOOL CFDE_XMLDoc::LoadXML(IFX_Stream* pXMLStream, iTextDataSize = 128; } m_pStream = pXMLStream; - FX_WORD wCodePage = m_pStream->GetCodePage(); + uint16_t wCodePage = m_pStream->GetCodePage(); if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE && wCodePage != FX_CODEPAGE_UTF8) { m_pStream->SetCodePage(FX_CODEPAGE_UTF8); @@ -958,7 +958,7 @@ void CFDE_XMLDoc::SaveXMLNode(IFX_Stream* pXMLStream, IFDE_XMLNode* pINode) { CFDE_XMLInstruction* pInstruction = (CFDE_XMLInstruction*)pNode; if (pInstruction->m_wsTarget.CompareNoCase(L"xml") == 0) { ws = L"<?xml version=\"1.0\" encoding=\""; - FX_WORD wCodePage = pXMLStream->GetCodePage(); + uint16_t wCodePage = pXMLStream->GetCodePage(); if (wCodePage == FX_CODEPAGE_UTF16LE) { ws += L"UTF-16"; } else if (wCodePage == FX_CODEPAGE_UTF16BE) { @@ -1067,7 +1067,7 @@ void CFDE_XMLDoc::SaveXML(IFX_Stream* pXMLStream, FX_BOOL bSaveBOM) { } FXSYS_assert((pXMLStream->GetAccessModes() & FX_STREAMACCESS_Text) != 0); FXSYS_assert((pXMLStream->GetAccessModes() & FX_STREAMACCESS_Write) != 0); - FX_WORD wCodePage = pXMLStream->GetCodePage(); + uint16_t wCodePage = pXMLStream->GetCodePage(); if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE && wCodePage != FX_CODEPAGE_UTF8) { wCodePage = FX_CODEPAGE_UTF8; |