diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
| commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
| tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /xfa/src/fxfa/src/parser/xfa_locale.cpp | |
| parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
| download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz | |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'xfa/src/fxfa/src/parser/xfa_locale.cpp')
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_locale.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 83c61d1a72..56a55cd4c3 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -17,10 +17,10 @@ #include "../common/xfa_fm2jsapi.h"
#include "xfa_debug_parser.h"
#include "xfa_locale.h"
-const static FX_LPCWSTR g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%";
-const static FX_LPCWSTR g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99";
-const static FX_LPCWSTR g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
-const static FX_LPCWSTR g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz";
+static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%";
+static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99";
+static const FX_WCHAR* g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
+static const FX_WCHAR* g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz";
CXFA_XMLLocale::CXFA_XMLLocale(CXML_Element* pLocaleData)
{
m_pLocaleData = pLocaleData;
@@ -79,7 +79,7 @@ void CXFA_XMLLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, CFX_WideString& if (!pElement) {
return;
}
- GetPattern(pElement, CFX_ByteStringC((FX_LPCSTR)bsSymbols, bsSymbols.GetLength() - 1), wsName, wsNumSymbol);
+ GetPattern(pElement, CFX_ByteStringC((const FX_CHAR*)bsSymbols, bsSymbols.GetLength() - 1), wsName, wsNumSymbol);
}
void CXFA_XMLLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const
{
|