Pass CFX_WideString further down widget callers

fpdfsdk/fxedit/fxet_edit.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 
 #include <algorithm>
 
@@ skipping 688 matching lines @@
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
 
 void CFXEU_Clear::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wrSel.BeginPos);
-    m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, FALSE, TRUE);
+    m_pEdit->InsertText(m_swText, DEFAULT_CHARSET, FALSE, TRUE);
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
   }
 }
 
 CFXEU_InsertText::CFXEU_InsertText(CFX_Edit* pEdit,
                                    const CPVT_WordPlace& wpOldPlace,
                                    const CPVT_WordPlace& wpNewPlace,
                                    const CFX_WideString& swText,
                                    int32_t charset)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_swText(swText),
       m_nCharset(charset) {}
 
 CFXEU_InsertText::~CFXEU_InsertText() {}
 
 void CFXEU_InsertText::Redo() {
   if (m_pEdit && IsLast()) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpOld);
-    m_pEdit->InsertText(m_swText.c_str(), m_nCharset, FALSE, TRUE);
+    m_pEdit->InsertText(m_swText, m_nCharset, FALSE, TRUE);
   }
 }
 
 void CFXEU_InsertText::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wpOld, m_wpNew);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
@@ skipping 921 matching lines @@
 
   if (wr1.EndPos.WordCmp(wr2.EndPos) < 0) {
     wrRet.EndPos = wr2.EndPos;
   } else {
     wrRet.EndPos = wr1.EndPos;
   }
 
   return wrRet;
 }
 
-void CFX_Edit::SetText(const FX_WCHAR* text) {
+void CFX_Edit::SetText(const CFX_WideString& sText) {

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

May as well leave this as |text| to match the rest of the methods.

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

Fixed the others, too.

   Empty();
-  DoInsertText(CPVT_WordPlace(0, 0, -1), text, DEFAULT_CHARSET);
+  DoInsertText(CPVT_WordPlace(0, 0, -1), sText, DEFAULT_CHARSET);
   Paint();
 }
 
 FX_BOOL CFX_Edit::InsertWord(uint16_t word, int32_t charset) {
   return InsertWord(word, charset, nullptr, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertReturn() {
   return InsertReturn(nullptr, nullptr, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Backspace() {
   return Backspace(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Delete() {
   return Delete(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Clear() {
   return Clear(TRUE, TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text, int32_t charset) {
+FX_BOOL CFX_Edit::InsertText(const CFX_WideString& text, int32_t charset) {
   return InsertText(text, charset, TRUE, TRUE);
 }
 
 FX_FLOAT CFX_Edit::GetFontSize() const {
   return m_pVT->GetFontSize();
 }
 
 uint16_t CFX_Edit::GetPasswordChar() const {
   return m_pVT->GetPasswordChar();
 }
@@ skipping 968 matching lines @@
     SetCaretOrigin();
     SetCaretInfo();
   }
 
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnClear(m_wpCaret, m_wpOldCaret);
 
   return TRUE;
 }
 
-FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text,
+FX_BOOL CFX_Edit::InsertText(const CFX_WideString& text,
                              int32_t charset,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
 
   m_pVT->UpdateWordPlace(m_wpCaret);
   SetCaret(DoInsertText(m_wpCaret, text, charset));
   m_SelState.Set(m_wpCaret, m_wpCaret);
 
@@ skipping 177 matching lines @@
   pIterator->SetAt(place);
   CPVT_Line line;
   pIterator->GetLine(line);
 
   pIterator->SetAt(wpOld);
 
   return line.ptLine.y + line.fLineDescent;
 }
 
 CPVT_WordPlace CFX_Edit::DoInsertText(const CPVT_WordPlace& place,
-                                      const FX_WCHAR* text,
+                                      const CFX_WideString& sText,

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

ditto

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

Others match this.

                                       int32_t charset) {
   CPVT_WordPlace wp = place;
 
   if (m_pVT->IsValid()) {
-    CFX_WideString sText = text;
-
     for (int32_t i = 0, sz = sText.GetLength(); i < sz; i++) {
       uint16_t word = sText[i];
       switch (word) {
         case 0x0D:
           wp = m_pVT->InsertSection(wp, nullptr, nullptr);
           if (sText[i + 1] == 0x0A)
             i++;
           break;
         case 0x0A:
           wp = m_pVT->InsertSection(wp, nullptr, nullptr);
@@ skipping 153 matching lines @@
 int32_t CFX_Edit_RectArray::GetSize() const {
   return m_Rects.GetSize();
 }
 
 CFX_FloatRect* CFX_Edit_RectArray::GetAt(int32_t nIndex) const {
   if (nIndex < 0 || nIndex >= m_Rects.GetSize())
     return nullptr;
 
   return m_Rects.GetAt(nIndex);
 }