Pass CFX_WideString further down widget callers

fpdfsdk/cpdfsdk_widget.cpp

Index: fpdfsdk/cpdfsdk_widget.cpp
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 2ddbccc28ce22d5479be9bab774eb88194a1c4bf..cc5396d09f06bcb6b47135c30e3117add540d7cf 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -739,7 +739,7 @@ void CPDFSDK_Widget::ResetAppearance(FX_BOOL bValueChanged) {
     case FIELDTYPE_COMBOBOX: {
       FX_BOOL bFormated = FALSE;
       CFX_WideString sValue = OnFormat(bFormated);
-      ResetAppearance(bFormated ? sValue.c_str() : nullptr, TRUE);
+      ResetAppearance(bFormated ? &sValue : nullptr, TRUE);
       break;
     }
     default:
@@ -749,7 +749,7 @@ void CPDFSDK_Widget::ResetAppearance(FX_BOOL bValueChanged) {
 }
 #endif  // PDF_ENABLE_XFA
 
-void CPDFSDK_Widget::ResetAppearance(const FX_WCHAR* sValue,
+void CPDFSDK_Widget::ResetAppearance(const CFX_WideString* sValue,
                                      FX_BOOL bValueChanged) {
   SetAppModified();
 
@@ -1353,7 +1353,7 @@ void CPDFSDK_Widget::ResetAppearance_RadioButton() {
     SetAppState("Off");
 }
 
-void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
+void CPDFSDK_Widget::ResetAppearance_ComboBox(const CFX_WideString* sValue) {
   CPDF_FormControl* pControl = GetFormControl();
   CPDF_FormField* pField = pControl->GetField();
   CFX_ByteTextBuf sBody, sLines;
@@ -1387,10 +1387,9 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
   pEdit->Initialize();
 
   if (sValue) {
-    pEdit->SetText(sValue);
+    pEdit->SetText(*sValue);
   } else {
     int32_t nCurSel = pField->GetSelectedIndex(0);
-
     if (nCurSel < 0)
       pEdit->SetText(pField->GetValue().c_str());
     else
@@ -1512,7 +1511,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
   WriteAppearance("N", GetRotatedRect(), GetMatrix(), sAP);
 }
 
-void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
+void CPDFSDK_Widget::ResetAppearance_TextField(const CFX_WideString* sValue) {
   CPDF_FormControl* pControl = GetFormControl();
   CPDF_FormField* pField = pControl->GetField();
   CFX_ByteTextBuf sBody, sLines;
@@ -1554,7 +1553,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
   CFX_WideString sValueTmp;
   if (!sValue && GetMixXFAWidget()) {
     sValueTmp = GetValue(TRUE);
-    sValue = sValueTmp.c_str();
+    sValue = &sValueTmp;

[dsinclair, 2016/09/08 13:00:11]

Do we need sValueTmp anymore? If so, can we move the definition inside the if()
as it doesn't appear to be used anywhere else.

[Tom Sepez, 2016/09/08 18:01:11]

No, the argument is a pointer to const, so we can't update the string itself, we
can just make it point to some other string, which itself must live for as long
as we use the pointer.

   }
 #endif  // PDF_ENABLE_XFA
 
@@ -1581,7 +1580,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
   pEdit->Initialize();
 
   if (sValue)
-    pEdit->SetText(sValue);
+    pEdit->SetText(*sValue);
   else
     pEdit->SetText(pField->GetValue().c_str());