Remove CFX_ArrayTemplate, use unique_ptr in fpdfsdk/pdfwindow

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/fxet_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 918 matching lines @@
           pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
           pFontMap->GetPDFFont(nFontIndex), fFontSize, pUser2Device,
           sTextBuf.MakeString(), crOldFill, crTextStroke, nHorzScale);
     }
   }
 
   pDevice->RestoreState(false);
 }
 
 // static
-void CFX_Edit::GeneratePageObjects(
-    CPDF_PageObjectHolder* pObjectHolder,
-    CFX_Edit* pEdit,
-    const CFX_FloatPoint& ptOffset,
-    const CPVT_WordRange* pRange,
-    FX_COLORREF crText,
-    CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
+void CFX_Edit::GeneratePageObjects(CPDF_PageObjectHolder* pObjectHolder,
+                                   CFX_Edit* pEdit,
+                                   const CFX_FloatPoint& ptOffset,
+                                   const CPVT_WordRange* pRange,
+                                   FX_COLORREF crText,
+                                   std::vector<CPDF_TextObject*>* ObjArray) {
+  ObjArray->clear();
+
+  IPVT_FontMap* pFontMap = pEdit->GetFontMap();
+  if (!pFontMap)
+    return;
+
   FX_FLOAT fFontSize = pEdit->GetFontSize();
+  int32_t nOldFontIndex = -1;
+  CFX_ByteTextBuf sTextBuf;
+  CPVT_WordPlace oldplace;
+  CFX_FloatPoint ptBT(0.0f, 0.0f);
+  CFX_Edit_Iterator* pIterator = pEdit->GetIterator();
+  if (pRange)
+    pIterator->SetAt(pRange->BeginPos);
+  else
+    pIterator->SetAt(0);
 
-  int32_t nOldFontIndex = -1;
+  while (pIterator->NextWord()) {
+    CPVT_WordPlace place = pIterator->GetAt();
+    if (pRange && place.WordCmp(pRange->EndPos) > 0)
+      break;
 
-  CFX_ByteTextBuf sTextBuf;
-  CFX_FloatPoint ptBT(0.0f, 0.0f);
+    CPVT_Word word;
+    if (!pIterator->GetWord(word))
+      continue;
 
-  ObjArray.RemoveAll();
+    if (place.LineCmp(oldplace) != 0 || nOldFontIndex != word.nFontIndex) {
+      if (sTextBuf.GetLength() > 0) {
+        ObjArray->push_back(AddTextObjToPageObjects(
+            pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
+            fFontSize, 0.0f, 100,
+            CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
+            sTextBuf.MakeString()));
 
-  CFX_Edit_Iterator* pIterator = pEdit->GetIterator();
-  if (IPVT_FontMap* pFontMap = pEdit->GetFontMap()) {
-    if (pRange)
-      pIterator->SetAt(pRange->BeginPos);
-    else
-      pIterator->SetAt(0);
-
-    CPVT_WordPlace oldplace;
-
-    while (pIterator->NextWord()) {
-      CPVT_WordPlace place = pIterator->GetAt();
-      if (pRange && place.WordCmp(pRange->EndPos) > 0)
-        break;
-
-      CPVT_Word word;
-      if (pIterator->GetWord(word)) {
-        if (place.LineCmp(oldplace) != 0 || nOldFontIndex != word.nFontIndex) {
-          if (sTextBuf.GetLength() > 0) {
-            ObjArray.Add(AddTextObjToPageObjects(
-                pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
-                fFontSize, 0.0f, 100,
-                CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-                sTextBuf.MakeString()));
-
-            sTextBuf.Clear();
-          }
-
-          ptBT = word.ptWord;
-          nOldFontIndex = word.nFontIndex;
-        }
-
-        sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0)
-                        .AsStringC();
-        oldplace = place;
+        sTextBuf.Clear();
       }
+      ptBT = word.ptWord;
+      nOldFontIndex = word.nFontIndex;
     }
-
-    if (sTextBuf.GetLength() > 0) {
-      ObjArray.Add(AddTextObjToPageObjects(
-          pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex), fFontSize,
-          0.0f, 100, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
-          sTextBuf.MakeString()));
-    }
+    sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0)
+                    .AsStringC();
+    oldplace = place;
+  }
+  if (sTextBuf.GetLength() > 0) {
+    ObjArray->push_back(AddTextObjToPageObjects(
+        pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex), fFontSize,
+        0.0f, 100, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
+        sTextBuf.MakeString()));
   }
 }
 
 CFX_Edit::CFX_Edit()
     : m_pVT(new CPDF_VariableText),
       m_pNotify(nullptr),
       m_pOprNotify(nullptr),
       m_wpCaret(-1, -1, -1),
       m_wpOldCaret(-1, -1, -1),
       m_SelState(),
@@ skipping 1518 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);
 }