diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-05 12:22:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-05 12:22:15 -0700 |
| commit | fc58ad18b7ab32e7b0bb3959b07dbe7538a7cebd (patch) | |
| tree | 8662b886d373b149fbdd6f5db9570c233cb23ce7 /xfa/fxfa/parser/xfa_localemgr.cpp | |
| parent | c7a7349cf316af37d4ad4b71c5742159deccbf33 (diff) | |
| download | pdfium-fc58ad18b7ab32e7b0bb3959b07dbe7538a7cebd.tar.xz | |
Make down-conversion explicit from CFX_Widetring to CFX_WideStringC.
Companion to https://codereview.chromium.org/1853233002
BUG=
Review URL: https://codereview.chromium.org/1857073002
Diffstat (limited to 'xfa/fxfa/parser/xfa_localemgr.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_localemgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 7ccf228177..0c09830094 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -1132,7 +1132,7 @@ CXFA_LocaleMgr::CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid) pNodeLocale = pNodeLocale->GetNodeItem(XFA_NODEITEM_NextSibling); } } - m_pDefLocale = GetLocaleByName(wsDeflcid); + m_pDefLocale = GetLocaleByName(wsDeflcid.AsWideStringC()); } CXFA_LocaleMgr::~CXFA_LocaleMgr() { int32_t iCount = m_LocaleArray.GetSize(); @@ -1266,7 +1266,7 @@ CFX_WideStringC CXFA_LocaleMgr::GetConfigLocaleName(CXFA_Node* pConfig) { } m_dwLocaleFlags |= 0x01; } - return m_wsConfigLocale; + return m_wsConfigLocale.AsWideStringC(); } static CXFA_TimeZoneProvider* g_pProvider = NULL; |