Merge to XFA: Don't bother passing -1 as the length to the CFX_ByteString ctor.

core/src/fpdftext/fpdf_text.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 "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdfapi/fpdf_resource.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "../../include/fxcrt/fx_arb.h"
 #include "../../include/fxcrt/fx_ucd.h"
 #include "text_int.h"
 #include "txtproc.h"
 
 CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode,
                                   int destcp,
                                   const FX_CHAR* defchar) {
   if (destcp == 0) {
     if (unicode < 0x80) {
       return CFX_ByteString((char)unicode);
     }
     const FX_CHAR* altstr = FCS_GetAltStr(unicode);
-    if (altstr) {
-      return CFX_ByteString(altstr, -1);
-    }
-    return CFX_ByteString(defchar, -1);
+    return CFX_ByteString(altstr ? altstr : defchar);
   }
   char buf[10];
   int iDef = 0;
   int ret = FXSYS_WideCharToMultiByte(destcp, 0, (wchar_t*)&unicode, 1, buf, 10,
                                       NULL, &iDef);
   if (ret && !iDef) {
     return CFX_ByteString(buf, ret);
   }
   const FX_CHAR* altstr = FCS_GetAltStr(unicode);
-  if (altstr) {
-    return CFX_ByteString(altstr, -1);
-  }
-  return CFX_ByteString(defchar, -1);
+  return CFX_ByteString(altstr ? altstr : defchar);
 }
 CTextPage::CTextPage() {}
 CTextPage::~CTextPage() {
   int i;
   for (i = 0; i < m_BaseLines.GetSize(); i++) {
     CTextBaseLine* pBaseLine = (CTextBaseLine*)m_BaseLines.GetAt(i);
     delete pBaseLine;
   }
   for (i = 0; i < m_TextColumns.GetSize(); i++) {
     CTextColumn* pTextColumn = (CTextColumn*)m_TextColumns.GetAt(i);
@@ skipping 737 matching lines @@
                                FX_DWORD flags) {
   buffer.EstimateSize(0, 10240);
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }