summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/cpvt_generateap.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-05 12:01:42 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-05 12:01:42 -0700
commitc7a7349cf316af37d4ad4b71c5742159deccbf33 (patch)
tree5006913b93a6d498e3df158bc644400e3a1a0c7c /core/fpdfdoc/cpvt_generateap.cpp
parent179bebb9a14dfd3ba91e9e068d4d436657a7c780 (diff)
downloadpdfium-c7a7349cf316af37d4ad4b71c5742159deccbf33.tar.xz
Remove core/include/fpdfdoc/fpdf_vt.h
This CL removes the core/include/fpdfdoc/fpdf_vt.h file. The IPDF_VariableText class was removed in favour of the only concrete class of CPD_VariableText. CPVT_Provider was moved to CPDF_VariableText::Provider and CPDF_VariableText_Iterator was moved to CPDF_VariableText::Iterator. The IFX_Edit_FontMap interface was merged into the IPVT_FontMap interface so there is only one. Other classes were split out as needed in order to keep things compiling. BUG=pdfium:468 Review URL: https://codereview.chromium.org/1860063002
Diffstat (limited to 'core/fpdfdoc/cpvt_generateap.cpp')
-rw-r--r--core/fpdfdoc/cpvt_generateap.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index c5e2cc7fab..f323d9a858 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfdoc/cpvt_color.h"
#include "core/fpdfdoc/cpvt_fontmap.h"
-#include "core/fpdfdoc/cpvt_provider.h"
+#include "core/fpdfdoc/include/cpvt_word.h"
#include "core/fpdfdoc/pdf_vt.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
@@ -217,7 +217,7 @@ FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc,
CPVT_FontMap map(
pDoc, pStreamDict ? pStreamDict->GetDictBy("Resources") : nullptr,
pDefFont, sFontName.Right(sFontName.GetLength() - 1));
- CPVT_Provider prd(&map);
+ CPDF_VariableText::Provider prd(&map);
CPDF_VariableText vt;
vt.SetProvider(&prd);
vt.SetPlateRect(rcBody);
@@ -276,7 +276,7 @@ FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc,
CPVT_FontMap map(
pDoc, pStreamDict ? pStreamDict->GetDictBy("Resources") : nullptr,
pDefFont, sFontName.Right(sFontName.GetLength() - 1));
- CPVT_Provider prd(&map);
+ CPDF_VariableText::Provider prd(&map);
CPDF_VariableText vt;
vt.SetProvider(&prd);
CFX_FloatRect rcButton = rcBody;
@@ -344,7 +344,7 @@ FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc,
CPVT_FontMap map(
pDoc, pStreamDict ? pStreamDict->GetDictBy("Resources") : nullptr,
pDefFont, sFontName.Right(sFontName.GetLength() - 1));
- CPVT_Provider prd(&map);
+ CPDF_VariableText::Provider prd(&map);
CPDF_Array* pOpts = FPDF_GetFieldAttr(pAnnotDict, "Opt")
? FPDF_GetFieldAttr(pAnnotDict, "Opt")->GetArray()
: nullptr;
@@ -502,7 +502,7 @@ FX_BOOL CPVT_GenerateAP::GenerateListBoxAP(CPDF_Document* pDoc,
// Static.
CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
IPVT_FontMap* pFontMap,
- IPDF_VariableText::Iterator* pIterator,
+ CPDF_VariableText::Iterator* pIterator,
const CFX_FloatPoint& ptOffset,
FX_BOOL bContinuous,
uint16_t SubWord,