Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: xfa/fgas/localization/fgas_localemgr.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: win error #2 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fgas/localization/fgas_locale.cpp ('k') | xfa/fwl/theme/cfwl_widgettp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fgas/localization/fgas_localemgr.h" 7 #include "xfa/fgas/localization/fgas_localemgr.h"
8 8
9 #include "core/fxcrt/include/fx_xml.h" 9 #include "core/fxcrt/include/fx_xml.h"
10 10
(...skipping 11 matching lines...) Expand all
22 if (wsFileName.GetLength() < 4) { 22 if (wsFileName.GetLength() < 4) {
23 continue; 23 continue;
24 } 24 }
25 CFX_WideString wsExt = wsFileName.Right(4); 25 CFX_WideString wsExt = wsFileName.Right(4);
26 wsExt.MakeLower(); 26 wsExt.MakeLower();
27 if (wsExt != L".xml") { 27 if (wsExt != L".xml") {
28 continue; 28 continue;
29 } 29 }
30 CFX_WideString wsFullPath(pszLocalPath); 30 CFX_WideString wsFullPath(pszLocalPath);
31 wsFullPath += L"\\" + wsFileName; 31 wsFullPath += L"\\" + wsFileName;
32 IFX_FileRead* pRead = FX_CreateFileRead(wsFullPath); 32 IFX_FileRead* pRead = FX_CreateFileRead(wsFullPath.c_str());
33 if (!pRead) { 33 if (!pRead) {
34 continue; 34 continue;
35 } 35 }
36 CXML_Element* pXmlLocale = CXML_Element::Parse(pRead); 36 CXML_Element* pXmlLocale = CXML_Element::Parse(pRead);
37 pRead->Release(); 37 pRead->Release();
38 CFX_ByteString bssp = pXmlLocale->GetNamespace(); 38 CFX_ByteString bssp = pXmlLocale->GetNamespace();
39 if (bssp == "http://www.foxitsoftware.com/localization") { 39 if (bssp == "http://www.foxitsoftware.com/localization") {
40 CFX_WideString wsLCID = pXmlLocale->GetAttrValue("", "lcid"); 40 CFX_WideString wsLCID = pXmlLocale->GetAttrValue("", "lcid");
41 wchar_t* pEnd = NULL; 41 wchar_t* pEnd = NULL;
42 uint32_t dwLCID = wcstol(wsLCID, &pEnd, 16); 42 uint32_t dwLCID = wcstol(wsLCID.c_str(), &pEnd, 16);
43 if (pLocaleMgr->m_lcid2xml.GetValueAt((void*)(uintptr_t)dwLCID)) { 43 if (pLocaleMgr->m_lcid2xml.GetValueAt((void*)(uintptr_t)dwLCID)) {
44 delete pXmlLocale; 44 delete pXmlLocale;
45 } else { 45 } else {
46 pLocaleMgr->m_lcid2xml.SetAt((void*)(uintptr_t)dwLCID, pXmlLocale); 46 pLocaleMgr->m_lcid2xml.SetAt((void*)(uintptr_t)dwLCID, pXmlLocale);
47 } 47 }
48 } else { 48 } else {
49 delete pXmlLocale; 49 delete pXmlLocale;
50 } 50 }
51 } 51 }
52 } 52 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 pLocale = IFX_Locale::Create(pxml); 88 pLocale = IFX_Locale::Create(pxml);
89 m_lcid2locale.SetAt((void*)(uintptr_t)lcid, pLocale); 89 m_lcid2locale.SetAt((void*)(uintptr_t)lcid, pLocale);
90 } 90 }
91 } 91 }
92 return pLocale; 92 return pLocale;
93 } 93 }
94 IFX_Locale* CFX_LocaleMgr::GetLocaleByName( 94 IFX_Locale* CFX_LocaleMgr::GetLocaleByName(
95 const CFX_WideStringC& wsLocaleName) { 95 const CFX_WideStringC& wsLocaleName) {
96 return NULL; 96 return NULL;
97 } 97 }
OLDNEW
« no previous file with comments | « xfa/fgas/localization/fgas_locale.cpp ('k') | xfa/fwl/theme/cfwl_widgettp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698