Index: core/include/fxcrt/fx_basic.h |
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h |
index 11c573be6e1374aeae0529b64e0ece8bc663de19..277286c80c0bd4de86c9fb31b54dd2614aade286 100644 |
--- a/core/include/fxcrt/fx_basic.h |
+++ b/core/include/fxcrt/fx_basic.h |
@@ -205,10 +205,10 @@ class CFX_FileBufferArchive { |
class CFX_CharMap { |
public: |
- static CFX_ByteString GetByteString(FX_WORD codepage, |
+ static CFX_ByteString GetByteString(uint16_t codepage, |
const CFX_WideString& wstr); |
- static CFX_WideString GetWideString(FX_WORD codepage, |
+ static CFX_WideString GetWideString(uint16_t codepage, |
const CFX_ByteString& bstr); |
CFX_CharMap() = delete; |
@@ -402,7 +402,6 @@ typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray; |
#ifdef PDF_ENABLE_XFA |
typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray; |
-typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray; |
typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray; |
typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray; |
typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array; |