fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp - Issue 1108903002: Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString().

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: fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

Issue 1108903002: Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 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: fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

index 744118fb9ccbcd292e350b41f8710d56413d76e6..33c95d4232ccd52788daedeb0acfe81bb54a68d3 100644

--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

@@ -266,7 +266,7 @@ void CPWL_ComboBox::SetSelect(FX_INT32 nItemIndex)

if (m_pList)

m_pList->Select(nItemIndex);

- m_pEdit->SetText(m_pList->GetText());

+ m_pEdit->SetText(m_pList->GetText().c_str());

m_nSelectItem = nItemIndex;

}

@@ -674,7 +674,7 @@ void CPWL_ComboBox::SetSelectText()

{

CFX_WideString swText = m_pList->GetText();

m_pEdit->SelectAll();

- m_pEdit->ReplaceSel(m_pList->GetText());

+ m_pEdit->ReplaceSel(m_pList->GetText().c_str());

m_pEdit->SelectAll();

m_nSelectItem = m_pList->GetCurSel();

« no previous file with comments | « fpdfsdk/src/javascript/util.cpp ('k') | fpdfsdk/src/pdfwindow/PWL_Edit.cpp » ('j') | no next file with comments »