diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-14 15:07:03 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 21:05:35 +0000 |
| commit | 25de4c67f8a0b197191d5e6b36f19821d0253ba0 (patch) | |
| tree | 7c18e62798d66f2c087a3015e7c52d275ccb0550 /xfa/fde/fde_iterator.cpp | |
| parent | 656c781e515508ae4818d826041e9d87862d3f3a (diff) | |
| download | pdfium-25de4c67f8a0b197191d5e6b36f19821d0253ba0.tar.xz | |
Replace CFDE_TxtEdtPage FX_POSITION usage with uint32_tchromium/3042
Change-Id: I8cd68aaeb3c1f7ba92f32bc4846bf2e7d02111e4
Reviewed-on: https://pdfium-review.googlesource.com/3033
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fde/fde_iterator.cpp')
| -rw-r--r-- | xfa/fde/fde_iterator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp index e9a644043d..ff4fc0e73c 100644 --- a/xfa/fde/fde_iterator.cpp +++ b/xfa/fde/fde_iterator.cpp @@ -19,8 +19,8 @@ bool CFDE_VisualSetIterator::AttachCanvas(CFDE_TxtEdtPage* pCanvas) { FDE_CANVASITEM canvas; canvas.hCanvas = nullptr; canvas.pCanvas = pCanvas; - canvas.hPos = pCanvas->GetFirstPosition(); - if (!canvas.hPos) + canvas.pos = pCanvas->GetFirstPosition(); + if (canvas.pos == 0) return false; m_CanvasStack.push(canvas); @@ -39,8 +39,8 @@ bool CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) { FDE_CANVASITEM* pCanvas = &m_CanvasStack.top(); ASSERT(pCanvas && pCanvas->pCanvas); - pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(); - return !!pCanvas->hPos; + pCanvas->pos = pCanvas->pCanvas->GetFirstPosition(); + return pCanvas->pos != 0; } void CFDE_VisualSetIterator::Reset() { @@ -53,7 +53,7 @@ FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext( CFDE_TxtEdtPage** ppCanvasSet) { while (!m_CanvasStack.empty()) { FDE_CANVASITEM* pCanvas = &m_CanvasStack.top(); - if (!pCanvas->hPos) { + if (pCanvas->pos == 0) { if (m_CanvasStack.size() == 1) break; @@ -62,7 +62,7 @@ FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext( } do { FDE_TEXTEDITPIECE* pObj = - pCanvas->pCanvas->GetNext(pCanvas->hPos, pVisualSet); + pCanvas->pCanvas->GetNext(&pCanvas->pos, pVisualSet); ASSERT(pObj); FDE_VISUALOBJTYPE eType = pVisualSet->GetType(); @@ -70,7 +70,7 @@ FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext( FDE_CANVASITEM canvas; canvas.hCanvas = pObj; canvas.pCanvas = static_cast<CFDE_TxtEdtPage*>(pVisualSet); - canvas.hPos = canvas.pCanvas->GetFirstPosition(); + canvas.pos = canvas.pCanvas->GetFirstPosition(); m_CanvasStack.push(canvas); break; } @@ -82,7 +82,7 @@ FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext( *phCanvasObj = pCanvas->hCanvas; return pObj; } - } while (pCanvas->hPos); + } while (pCanvas->pos != 0); } if (ppCanvasSet) *ppCanvasSet = nullptr; |