XFA: merge patch from issue 801913002 and 804463003

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 "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "txtproc.h"
 #include "text_int.h"
-#if !defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_)
 extern FX_LPCSTR FCS_GetAltStr(FX_WCHAR);
 CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode, int destcp, FX_LPCSTR defchar)
 {
     if (destcp == 0) {
         if (unicode < 0x80) {
             return CFX_ByteString((char)unicode);
         }
         FX_LPCSTR altstr = FCS_GetAltStr(unicode);
         if (altstr) {
             return CFX_ByteString(altstr, -1);
@@ skipping 746 matching lines @@
     PDF_GetPageText_Unicode(wlines, pDoc, pPage, iMinWidth, flags);
     for (int i = 0; i < wlines.GetSize(); i ++) {
         CFX_WideString wstr = wlines[i];
         CFX_ByteString str;
         for (int c = 0; c < wstr.GetLength(); c ++) {
             str += CharFromUnicodeAlt(wstr[c], FXSYS_GetACP(), "?");
         }
         lines.Add(str);
     }
 }
-#endif
 extern void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, FX_BOOL bUseLF,
                                        CFX_PtrArray* pObjArray);
 void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_Document* pDoc, CPDF_Dictionary* pPage, 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);
     _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }