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

Unified Diff: fpdfsdk/javascript/Field.cpp

Issue 2323493002: Pass CFX_WideString further down widget callers (Closed)
Patch Set: Null vs Empty string significant in places 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
« fpdfsdk/fxedit/fxet_edit.cpp ('K') | « fpdfsdk/include/cpdfsdk_widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/javascript/Field.cpp
diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 3f5e5e1b0f57ae9aabb2675b4a0705d8e1bee752..ab779f1c9487c3b01b0a5378551c8cec391121bd 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -273,8 +273,7 @@ void Field::UpdateFormField(CPDFSDK_Document* pDocument,
CPDFSDK_Widget::Observer observer(&pAnnot);
CFX_WideString sValue = pWidget->OnFormat(bFormatted);
if (pAnnot) {
- pWidget->ResetAppearance(bFormatted ? sValue.c_str() : nullptr,
- FALSE);
+ pWidget->ResetAppearance(bFormatted ? &sValue : nullptr, FALSE);
}
}
} else {
@@ -310,12 +309,9 @@ void Field::UpdateFormControl(CPDFSDK_Document* pDocument,
int nFieldType = pWidget->GetFieldType();
if (nFieldType == FIELDTYPE_COMBOBOX ||
nFieldType == FIELDTYPE_TEXTFIELD) {
- FX_BOOL bFormated = FALSE;
- CFX_WideString sValue = pWidget->OnFormat(bFormated);
- if (bFormated)
- pWidget->ResetAppearance(sValue.c_str(), FALSE);
- else
- pWidget->ResetAppearance(nullptr, FALSE);
+ FX_BOOL bFormatted = FALSE;
+ CFX_WideString sValue = pWidget->OnFormat(bFormatted);
+ pWidget->ResetAppearance(bFormatted ? &sValue : nullptr, FALSE);
} else {
pWidget->ResetAppearance(nullptr, FALSE);
}
« fpdfsdk/fxedit/fxet_edit.cpp ('K') | « fpdfsdk/include/cpdfsdk_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698