diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-12-07 18:18:14 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-07 18:18:14 +0000 |
| commit | 39a076f19c05ac1ebb4f1dd15f9835ffb8611ae0 (patch) | |
| tree | 2385e695edbbc94d37b552ac73ccbf4438a01872 /xfa | |
| parent | 50a3124a7a1fa7596b9306445786d73e7cac2d90 (diff) | |
| download | pdfium-39a076f19c05ac1ebb4f1dd15f9835ffb8611ae0.tar.xz | |
Fix WideString::Format instances that should use %ls
BUG=pdfium:951
Change-Id: I4b82ce81c8db3f00fa2341c6fb853ed84814e5e5
Reviewed-on: https://pdfium-review.googlesource.com/20510
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fwl/cfwl_monthcalendar.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_fftextedit.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_nodehelper.cpp | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp index 5f23a1e8e9..08ed83f4f1 100644 --- a/xfa/fwl/cfwl_monthcalendar.cpp +++ b/xfa/fwl/cfwl_monthcalendar.cpp @@ -677,7 +677,7 @@ WideString CFWL_MonthCalendar::GetHeadText(int32_t iYear, int32_t iMonth) { L"April", L"May", L"June", L"July", L"August", L"September", L"October", L"November", L"December"}; - return WideString::Format(L"%s, %d", pMonth[iMonth - 1], iYear); + return WideString::Format(L"%ls, %d", pMonth[iMonth - 1], iYear); } WideString CFWL_MonthCalendar::GetTodayText(int32_t iYear, diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp index 88567213ca..ea9e4dbe36 100644 --- a/xfa/fxfa/cxfa_fftextedit.cpp +++ b/xfa/fxfa/cxfa_fftextedit.cpp @@ -203,7 +203,7 @@ void CXFA_FFTextEdit::ValidateNumberField(const WideString& wsText) { WideString wsSomField; pAcc->GetNode()->GetSOMExpression(wsSomField); - pAppProvider->MsgBox(WideString::Format(L"%s can not contain %s", + pAppProvider->MsgBox(WideString::Format(L"%ls can not contain %ls", wsText.c_str(), wsSomField.c_str()), pAppProvider->GetAppTitle(), XFA_MBICON_Error, XFA_MB_OK); diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index e3d6aa0bb5..3324a9ba3d 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -256,14 +256,15 @@ void CXFA_NodeHelper::GetNameExpression(CXFA_Node* refNode, (bIsProperty && refNode->GetElementType() != XFA_Element::PageSet)) { ws = refNode->GetClassName(); wsName = - WideString::Format(L"#%s[%d]", ws.c_str(), + WideString::Format(L"#%ls[%d]", ws.c_str(), GetIndex(refNode, eLogicType, bIsProperty, true)); return; } ws = refNode->JSNode()->GetCData(XFA_Attribute::Name); ws.Replace(L".", L"\\."); - wsName = WideString::Format( - L"%s[%d]", ws.c_str(), GetIndex(refNode, eLogicType, bIsProperty, false)); + wsName = + WideString::Format(L"%ls[%d]", ws.c_str(), + GetIndex(refNode, eLogicType, bIsProperty, false)); } bool CXFA_NodeHelper::NodeIsTransparent(CXFA_Node* refNode) { |