diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-11-10 19:22:24 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-10 19:22:24 +0000 |
| commit | 267d2a862fd9ec7bc722533914e8e5af8a19df26 (patch) | |
| tree | 1b913d9b1f0c6ab4c3ce7436477a009b7f429f73 /xfa/fxfa/cxfa_widgetacc.cpp | |
| parent | c7056ca0027eb34ed9abf31338c4cd2ffff40528 (diff) | |
| download | pdfium-267d2a862fd9ec7bc722533914e8e5af8a19df26.tar.xz | |
Cleanup public methods of CXFA_TextLayout
Change-Id: I532c3d7b76b650bbc262925b6a4a26f596a16814
Reviewed-on: https://pdfium-review.googlesource.com/18331
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_widgetacc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 2c54c3cf49..cb43783bdc 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -709,7 +709,7 @@ void CXFA_WidgetAcc::CalcCaptionSize(CFX_SizeF& szCap) { szCap.width = fCapReserve; CFX_SizeF minSize; - pCapTextLayout->CalcSize(minSize, szCap, szCap); + szCap = pCapTextLayout->CalcSize(minSize, szCap); if (bReserveExit) bVert ? szCap.height = fCapReserve : szCap.width = fCapReserve; } else { @@ -1181,8 +1181,9 @@ bool CXFA_WidgetAcc::FindSplitPos(int32_t iBlockIndex, float& fCalcHeight) { CXFA_TextLayout* pTextLayout = static_cast<CXFA_TextLayoutData*>(m_pLayoutData.get())->GetTextLayout(); - pTextLayout->DoLayout(iBlockIndex, fCalcHeight, fCalcHeight, - m_pLayoutData->m_fWidgetHeight - fTopInset); + fCalcHeight = + pTextLayout->DoLayout(iBlockIndex, fCalcHeight, fCalcHeight, + m_pLayoutData->m_fWidgetHeight - fTopInset); if (fCalcHeight != 0) { if (iBlockIndex == 0) fCalcHeight = fCalcHeight + fTopInset; |