diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-21 16:09:36 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-21 16:09:36 -0800 |
| commit | 8139bc147f6936d490d2e47632213ec13251e925 (patch) | |
| tree | 881be2d42955320a6f296c9558c11804f1edb71a /fpdfsdk/src | |
| parent | b5b2a9162e3e5d17b233d912399daca9be5ed51b (diff) | |
| download | pdfium-8139bc147f6936d490d2e47632213ec13251e925.tar.xz | |
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 .
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fxedit/fxet_pageobjs.cpp | 10 | ||||
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_Edit.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
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<CPDF_TextObject*>& 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<CPDF_TextObject*> ObjArray; IFX_Edit::GeneratePageObjects( |