summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-12-13 12:45:56 -0800
committerCommit bot <commit-bot@chromium.org>2016-12-13 12:45:56 -0800
commit988599c5d81bbb568f949454580ec6001258f806 (patch)
treeef17a32995dabec3c63418a2f65fb21a950ade70 /xfa/fgas/layout
parent05b4fc1227f5b6d39a3a65daf915a92ea3b749f4 (diff)
downloadpdfium-988599c5d81bbb568f949454580ec6001258f806.tar.xz
Replace CFX_FloatArray with std::vector
Review-Url: https://codereview.chromium.org/2567503002
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.cpp5
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index ef65bf9779..8e4fbf7969 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -10,6 +10,7 @@
#include "core/fxcrt/fx_arabic.h"
#include "core/fxcrt/fx_arb.h"
+#include "third_party/base/stl_util.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/layout/fgas_linebreak.h"
#include "xfa/fgas/layout/fgas_unicode.h"
@@ -152,9 +153,9 @@ void CFX_RTFBreak::AddPositionedTab(FX_FLOAT fTabPos) {
m_bOrphanLine = false;
}
}
-void CFX_RTFBreak::SetPositionedTabs(const CFX_FloatArray& tabs) {
+void CFX_RTFBreak::SetPositionedTabs(const std::vector<FX_FLOAT>& tabs) {
m_PositionedTabs.RemoveAll();
- int32_t iCount = tabs.GetSize();
+ int32_t iCount = pdfium::CollectionSize<int32_t>(tabs);
m_PositionedTabs.SetSize(iCount);
int32_t iLineEnd = m_iBoundaryEnd;
int32_t iTabPos;
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index d75bbc1d31..de2497ed1d 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -7,6 +7,8 @@
#ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
#define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
+#include <vector>
+
#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/fx_ucd.h"
#include "xfa/fgas/crt/fgas_memory.h"
@@ -224,7 +226,7 @@ class CFX_RTFBreak {
void SetFontSize(FX_FLOAT fFontSize);
void SetTabWidth(FX_FLOAT fTabWidth);
void AddPositionedTab(FX_FLOAT fTabPos);
- void SetPositionedTabs(const CFX_FloatArray& tabs);
+ void SetPositionedTabs(const std::vector<FX_FLOAT>& tabs);
void ClearPositionedTabs();
void SetDefaultChar(FX_WCHAR wch);
void SetLineBreakChar(FX_WCHAR wch);