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

Unified Diff: fpdfsdk/cpdfsdk_widget.cpp

Issue 2338553002: Stop converting widestring -> c_str -> widestring in several places. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « core/fpdfdoc/include/cpdf_variabletext.h ('k') | fpdfsdk/formfiller/cffl_combobox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/cpdfsdk_widget.cpp
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index a8ebef6e995115efbb0791999d168ee91102a227..016e78a848ee7a9e008a4433060e860e4aa10ca1 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -1391,9 +1391,9 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const CFX_WideString* sValue) {
} else {
int32_t nCurSel = pField->GetSelectedIndex(0);
if (nCurSel < 0)
- pEdit->SetText(pField->GetValue().c_str());
+ pEdit->SetText(pField->GetValue());
else
- pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str());
+ pEdit->SetText(pField->GetOptionLabel(nCurSel));
}
CFX_FloatRect rcContent = pEdit->GetContentRect();
@@ -1462,7 +1462,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
}
}
- pEdit->SetText(pField->GetOptionLabel(i).c_str());
+ pEdit->SetText(pField->GetOptionLabel(i));
CFX_FloatRect rcContent = pEdit->GetContentRect();
FX_FLOAT fItemHeight = rcContent.Height();
@@ -1578,14 +1578,9 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const CFX_WideString* sValue) {
pEdit->SetFontSize(fFontSize);
pEdit->Initialize();
-
- if (sValue)
- pEdit->SetText(*sValue);
- else
- pEdit->SetText(pField->GetValue().c_str());
+ pEdit->SetText(sValue ? *sValue : pField->GetValue());
CFX_FloatRect rcContent = pEdit->GetContentRect();
-
CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(
pEdit.get(), CFX_FloatPoint(0.0f, 0.0f), nullptr, !bCharArray, subWord);
« no previous file with comments | « core/fpdfdoc/include/cpdf_variabletext.h ('k') | fpdfsdk/formfiller/cffl_combobox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698