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 ++-- fpdfsdk/src/fxedit/fxet_pageobjs.cpp | 10 +++++----- fpdfsdk/src/pdfwindow/PWL_Edit.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'fpdfsdk') 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: diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp index 18687679c2..6cdcc84991 100644 --- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp @@ -409,7 +409,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, pDevice->RestoreState(); } -static void AddRectToPageObjects(CPDF_PageObjects* pPageObjs, +static void AddRectToPageObjects(CPDF_PageObjectList* pPageObjs, FX_COLORREF crFill, const CPDF_Rect& rcFill) { CPDF_PathObject* pPathObj = new CPDF_PathObject; @@ -429,7 +429,7 @@ static void AddRectToPageObjects(CPDF_PageObjects* pPageObjs, pPageObjs->InsertObject(pPageObjs->GetLastObjectPosition(), pPathObj); } -static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjects* pPageObjs, +static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectList* pPageObjs, FX_COLORREF crText, CPDF_Font* pFont, FX_FLOAT fFontSize, @@ -468,7 +468,7 @@ static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjects* pPageObjs, } void IFX_Edit::GeneratePageObjects( - CPDF_PageObjects* pPageObjects, + CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, @@ -532,7 +532,7 @@ void IFX_Edit::GeneratePageObjects( } void IFX_Edit::GenerateRichPageObjects( - CPDF_PageObjects* pPageObjects, + CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, @@ -624,7 +624,7 @@ void IFX_Edit::GenerateRichPageObjects( } } -void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjects* pPageObjects, +void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectList* pPageObjects, IFX_Edit* pEdit, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp index 8ddb7dfb6e..cbef23cc19 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp @@ -1168,7 +1168,7 @@ CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place, } void CPWL_Edit::GeneratePageObjects( - CPDF_PageObjects* pPageObjects, + CPDF_PageObjectList* pPageObjects, const CPDF_Point& ptOffset, CFX_ArrayTemplate& ObjArray) { IFX_Edit::GeneratePageObjects( @@ -1177,7 +1177,7 @@ void CPWL_Edit::GeneratePageObjects( ObjArray); } -void CPWL_Edit::GeneratePageObjects(CPDF_PageObjects* pPageObjects, +void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectList* pPageObjects, const CPDF_Point& ptOffset) { CFX_ArrayTemplate ObjArray; IFX_Edit::GeneratePageObjects( -- cgit v1.2.3