xfa/fxfa/parser/xfa_locale.cpp - Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC.

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/fxfa/parser/xfa_locale.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: String argument type 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/fxfa/parser/xfa_locale.cpp

diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp

index 141e295be9849217eb302c02c5283bb9be2485ce..c77dc2637dc9908e2c6047137d0cc62e35887626 100644

--- a/xfa/fxfa/parser/xfa_locale.cpp

+++ b/xfa/fxfa/parser/xfa_locale.cpp

@@ -79,7 +79,7 @@ void CXFA_XMLLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType,

}

GetPattern(pElement, CFX_ByteStringC((const FX_CHAR*)bsSymbols,

bsSymbols.GetLength() - 1),

- wsName, wsNumSymbol);

+ wsName.AsWideStringC(), wsNumSymbol);

}

void CXFA_XMLLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const {

if (!m_pLocaleData) {

@@ -162,7 +162,7 @@ void CXFA_XMLLocale::GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType,

wsName = L"long";

break;

}

- GetPattern(pElement, "datePattern", wsName, wsPattern);

+ GetPattern(pElement, "datePattern", wsName.AsWideStringC(), wsPattern);

}

void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType,

CFX_WideString& wsPattern) const {

@@ -186,7 +186,7 @@ void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType,

wsName = L"long";

break;

}

- GetPattern(pElement, "timePattern", wsName, wsPattern);

+ GetPattern(pElement, "timePattern", wsName.AsWideStringC(), wsPattern);

}

void CXFA_XMLLocale::GetNumPattern(FX_LOCALENUMSUBCATEGORY eType,

CFX_WideString& wsPattern) const {

« no previous file with comments | « xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp ('k') | xfa/fxfa/parser/xfa_localemgr.cpp » ('j') | no next file with comments »