diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-17 10:46:25 -0800 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-17 10:52:50 -0800 |
| commit | 0ed3b28a70c64e06340b892e6b5e753f80b0fa4e (patch) | |
| tree | 4242bbd769b19621e9131cff0fb3b5d837913051 /core | |
| parent | 2b7a49dabdac7c31975f2662f6513c0930617231 (diff) | |
| download | pdfium-0ed3b28a70c64e06340b892e6b5e753f80b0fa4e.tar.xz | |
Merge to XFA: patch from CL 730993002
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fxcrt/fx_string.h | 2 | ||||
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 26b04b70fa..364c510f73 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -597,7 +597,7 @@ private: } }; typedef const CFX_WideStringC& FX_WSTR; -#define FX_WSTRC(wstr) CFX_WideStringC((FX_LPCWSTR)wstr, sizeof(wstr) / sizeof(FX_WCHAR) - 1) +#define FX_WSTRC(wstr) CFX_WideStringC(wstr, sizeof(wstr) / sizeof(FX_WCHAR) - 1) struct CFX_StringDataW { long m_nRefs; diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 3a13d59054..0827fb6f34 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -586,7 +586,7 @@ FX_STRSIZE CFX_WideString::Find(FX_LPCWSTR lpszSub, FX_STRSIZE nStart) const if (nLength < 1 || nStart > nLength) { return -1; } - FX_LPCWSTR lpsz = (FX_LPCWSTR)FXSYS_wcsstr(m_pData->m_String + nStart, lpszSub); + FX_LPCWSTR lpsz = FXSYS_wcsstr(m_pData->m_String + nStart, lpszSub); return (lpsz == NULL) ? -1 : (int)(lpsz - m_pData->m_String); } FX_STRSIZE CFX_WideString::Find(FX_WCHAR ch, FX_STRSIZE nStart) const @@ -598,7 +598,7 @@ FX_STRSIZE CFX_WideString::Find(FX_WCHAR ch, FX_STRSIZE nStart) const if (nStart >= nLength) { return -1; } - FX_LPCWSTR lpsz = (FX_LPCWSTR)FXSYS_wcschr(m_pData->m_String + nStart, ch); + FX_LPCWSTR lpsz = FXSYS_wcschr(m_pData->m_String + nStart, ch); return (lpsz == NULL) ? -1 : (int)(lpsz - m_pData->m_String); } void CFX_WideString::TrimRight(FX_LPCWSTR lpszTargetList) |