From 8139bc147f6936d490d2e47632213ec13251e925 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 21 Jan 2016 16:09:36 -0800 Subject: Merge to XFA: Rename CPDF_PageObjects to CPDF_PageObjectList Orignal Review URL: https://codereview.chromium.org/1612113003 . (cherry picked from commit 9ebc84109d7d2f7b81f06f19e5db20888e026c3b) R=ochang@chromium.org TBR=ochang@chromium.org Review URL: https://codereview.chromium.org/1612243002 . --- fpdfsdk/include/fxedit/fx_edit.h | 8 ++++---- fpdfsdk/include/pdfwindow/PWL_Edit.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index a8f5bba870..59ac2b13ba 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -14,7 +14,7 @@ class CFX_RenderDevice; class CPDF_Font; class CFX_Matrix; -class CPDF_PageObjects; +class CPDF_PageObjectList; class CPDF_Point; class CPDF_TextObject; class IFX_Edit; @@ -458,19 +458,19 @@ class IFX_Edit { const CPDF_Point& ptOffset, const CPVT_WordRange* pRange); static void GeneratePageObjects( - CPDF_PageObjects* pPageObjects, + CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, FX_COLORREF crText, CFX_ArrayTemplate& ObjArray); static void GenerateRichPageObjects( - CPDF_PageObjects* pPageObjects, + CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, CFX_ArrayTemplate& ObjArray); - static void GenerateUnderlineObjects(CPDF_PageObjects* pPageObjects, + static void GenerateUnderlineObjects(CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index e7be15639d..7885331bc7 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -110,10 +110,10 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify { m_pFillerNotify = pNotify; } - void GeneratePageObjects(CPDF_PageObjects* pPageObjects, + void GeneratePageObjects(CPDF_PageObjectList* pPageObjects, const CPDF_Point& ptOffset, CFX_ArrayTemplate& ObjArray); - void GeneratePageObjects(CPDF_PageObjects* pPageObjects, + void GeneratePageObjects(CPDF_PageObjectList* pPageObjects, const CPDF_Point& ptOffset); protected: -- cgit v1.2.3