diff options
author | Henrique Nakashima <hnakashima@chromium.org> | 2018-06-07 19:43:42 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-07 19:43:42 +0000 |
commit | 888af47eec5784c1919200087769b7e58e5efd02 (patch) | |
tree | 5e9916c5f3b83ff4f33674a945a987c38ad68d05 /core/fpdfdoc | |
parent | 4cc32e30aaacc2e527acd052fa038158f4294636 (diff) | |
download | pdfium-888af47eec5784c1919200087769b7e58e5efd02.tar.xz |
Rename CPDF_PageObjectHolder::GetFormDict() to GetDict().
Renamed the underlying member m_pFormDict as well.
These names are misleading, as a page also uses the same field as
the page dict.
Change-Id: I52e0f1864a917a1e1b863725cb0d4f22faecacb3
Reviewed-on: https://pdfium-review.googlesource.com/34450
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r-- | core/fpdfdoc/cpdf_annot.cpp | 4 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_annotlist.cpp | 4 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 4 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_linklist.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index ee79c21c0d..13bceab695 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -53,9 +53,9 @@ CPDF_Form* AnnotGetMatrix(const CPDF_Page* pPage, if (!pForm) return nullptr; - CFX_Matrix form_matrix = pForm->GetFormDict()->GetMatrixFor("Matrix"); + CFX_Matrix form_matrix = pForm->GetDict()->GetMatrixFor("Matrix"); CFX_FloatRect form_bbox = - form_matrix.TransformRect(pForm->GetFormDict()->GetRectFor("BBox")); + form_matrix.TransformRect(pForm->GetDict()->GetRectFor("BBox")); matrix->MatchRect(pAnnot->GetRect(), form_bbox); matrix->Concat(*pUser2Device); return pForm; diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index e364a72d35..5fbe69977a 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -121,10 +121,10 @@ void GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict) { CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) : m_pDocument(pPage->GetDocument()) { - if (!pPage->GetFormDict()) + if (!pPage->GetDict()) return; - CPDF_Array* pAnnots = pPage->GetFormDict()->GetArrayFor("Annots"); + CPDF_Array* pAnnots = pPage->GetDict()->GetArrayFor("Annots"); if (!pAnnots) return; diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index c743e2b0a6..2e5c17508a 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -732,7 +732,7 @@ CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage, const CFX_PointF& point, int* z_order) const { - CPDF_Array* pAnnotList = pPage->GetFormDict()->GetArrayFor("Annots"); + CPDF_Array* pAnnotList = pPage->GetDict()->GetArrayFor("Annots"); if (!pAnnotList) return nullptr; @@ -881,7 +881,7 @@ bool CPDF_InterForm::HasXFAForm() const { } void CPDF_InterForm::FixPageFields(CPDF_Page* pPage) { - CPDF_Dictionary* pPageDict = pPage->GetFormDict(); + CPDF_Dictionary* pPageDict = pPage->GetDict(); if (!pPageDict) return; diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp index 2f5d4aee3e..0f56612e66 100644 --- a/core/fpdfdoc/cpdf_linklist.cpp +++ b/core/fpdfdoc/cpdf_linklist.cpp @@ -15,7 +15,7 @@ CPDF_LinkList::~CPDF_LinkList() {} const std::vector<CPDF_Dictionary*>* CPDF_LinkList::GetPageLinks( CPDF_Page* pPage) { - uint32_t objnum = pPage->GetFormDict()->GetObjNum(); + uint32_t objnum = pPage->GetDict()->GetObjNum(); if (objnum == 0) return nullptr; @@ -55,7 +55,7 @@ CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage, void CPDF_LinkList::LoadPageLinks(CPDF_Page* pPage, std::vector<CPDF_Dictionary*>* pList) { - CPDF_Array* pAnnotList = pPage->GetFormDict()->GetArrayFor("Annots"); + CPDF_Array* pAnnotList = pPage->GetDict()->GetArrayFor("Annots"); if (!pAnnotList) return; |