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 /core/src/fpdftext | |
| 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 'core/src/fpdftext')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_search.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdftext/text_int.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp index 80bf5ec99a..de38a7f540 100644 --- a/core/src/fpdftext/fpdf_text_search.cpp +++ b/core/src/fpdftext/fpdf_text_search.cpp @@ -296,7 +296,7 @@ FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, return FALSE; } void GetTextStream_Unicode(CFX_WideTextBuf& buffer, - CPDF_PageObjects* pPage, + CPDF_PageObjectList* pPage, FX_BOOL bUseLF, CFX_PtrArray* pObjArray) { CPDF_TextStream textstream(buffer, bUseLF, pObjArray); diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index bc3cc5bacf..acc9bfacc6 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -133,7 +133,7 @@ class CPDF_TextPage : public IPDF_TextPage { CPDFText_ParseOptions m_ParseOptions; CFX_WordArray m_CharIndex; - const CPDF_PageObjects* const m_pPage; + const CPDF_PageObjectList* const m_pPage; PAGECHAR_InfoArray m_charList; CFX_WideTextBuf m_TextBuf; PAGECHAR_InfoArray m_TempCharList; @@ -241,7 +241,7 @@ FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst); void NormalizeString(CFX_WideString& str); void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest); void GetTextStream_Unicode(CFX_WideTextBuf& buffer, - CPDF_PageObjects* pPage, + CPDF_PageObjectList* pPage, FX_BOOL bUseLF, CFX_PtrArray* pObjArray); |