diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-20 21:19:13 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-20 21:19:13 +0000 |
| commit | 2501ae2474c1f097a06634d647de2eb3fb730864 (patch) | |
| tree | 3ac7d386a3e73f3c848c203c3f0e61af9d284c1f /xfa/fxfa/cxfa_fftext.cpp | |
| parent | 89453e92d5d0b7aaf9e0c3890a90a21adc94a0ce (diff) | |
| download | pdfium-2501ae2474c1f097a06634d647de2eb3fb730864.tar.xz | |
Remove CXFA_DataData operator bool override
This CL removes CXFA_DataData::operator bool in favour of an explicit
HasValidNode method. This makes the call sites a lot clearer.
Change-Id: I6fae14fdeec4674ca7916e21b9e5703070fc3069
Reviewed-on: https://pdfium-review.googlesource.com/18830
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fftext.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_fftext.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp index 18eb20001a..1eac4fd309 100644 --- a/xfa/fxfa/cxfa_fftext.cpp +++ b/xfa/fxfa/cxfa_fftext.cpp @@ -40,7 +40,8 @@ void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS, CFX_RenderDevice* pRenderDevice = pGS->GetRenderDevice(); CFX_RectF rtText = GetRectWithoutRotate(); - if (CXFA_MarginData marginData = m_pDataAcc->GetMarginData()) { + CXFA_MarginData marginData = m_pDataAcc->GetMarginData(); + if (marginData.HasValidNode()) { CXFA_LayoutItem* pItem = this; if (!pItem->GetPrev() && !pItem->GetNext()) { XFA_RectWidthoutMargin(rtText, marginData); @@ -87,7 +88,8 @@ bool CXFA_FFText::PerformLayout() { pItem = pItem->GetFirst(); while (pItem) { CFX_RectF rtText = pItem->GetRect(false); - if (CXFA_MarginData marginData = m_pDataAcc->GetMarginData()) { + CXFA_MarginData marginData = m_pDataAcc->GetMarginData(); + if (marginData.HasValidNode()) { if (!pItem->GetPrev()) { float fTopInset; marginData.GetTopInset(fTopInset); |