xfa/fgas/localization/fgas_localemgr.cpp - Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: xfa/fgas/localization/fgas_localemgr.cpp

diff --git a/xfa/fgas/localization/fgas_localemgr.cpp b/xfa/fgas/localization/fgas_localemgr.cpp

index 69b8638903453485282b1bb74793a3e2aad77f04..93e5ea08744757ef14bbd74c128ed67c20ea6c52 100644

--- a/xfa/fgas/localization/fgas_localemgr.cpp

+++ b/xfa/fgas/localization/fgas_localemgr.cpp

@@ -29,7 +29,7 @@ IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath,

}

CFX_WideString wsFullPath(pszLocalPath);

wsFullPath += L"\\" + wsFileName;

- IFX_FileRead* pRead = FX_CreateFileRead(wsFullPath);

+ IFX_FileRead* pRead = FX_CreateFileRead(wsFullPath.c_str());

if (!pRead) {

continue;

}

@@ -39,7 +39,7 @@ IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath,

if (bssp == "http://www.foxitsoftware.com/localization") {

CFX_WideString wsLCID = pXmlLocale->GetAttrValue("", "lcid");

wchar_t* pEnd = NULL;

- uint32_t dwLCID = wcstol(wsLCID, &pEnd, 16);

+ uint32_t dwLCID = wcstol(wsLCID.c_str(), &pEnd, 16);

if (pLocaleMgr->m_lcid2xml.GetValueAt((void*)(uintptr_t)dwLCID)) {

delete pXmlLocale;

} else {

« no previous file with comments | « xfa/fgas/localization/fgas_locale.cpp ('k') | xfa/fwl/theme/cfwl_widgettp.cpp » ('j') | no next file with comments »