diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-07 09:04:28 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-07 14:33:17 +0000 |
| commit | c222907f453e8a0e6376a86f89354eedb8285854 (patch) | |
| tree | 8ac6942b7fe65f7eb6dbc951a6a1f77aa9e18afc /xfa/fxfa/app/xfa_fffield.cpp | |
| parent | 76da8841aef9a60c1c65c646a9f943c25861bc33 (diff) | |
| download | pdfium-c222907f453e8a0e6376a86f89354eedb8285854.tar.xz | |
Cleanup out params in XFA layout code.
This CL converts some of the out parameters in the XFA layout code to pointers
instead of references.
Change-Id: I6246b91b975e7bc08f8cfb040de9dfdc3c3bedee
Reviewed-on: https://pdfium-review.googlesource.com/2531
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/xfa_fffield.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_fffield.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp index a8ee0b9acc..c053a8c6ca 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -30,6 +30,7 @@ CXFA_FFField::CXFA_FFField(CXFA_WidgetAcc* pDataAcc) m_rtUI.Set(0, 0, 0, 0); m_rtCaption.Set(0, 0, 0, 0); } + CXFA_FFField::~CXFA_FFField() { CXFA_FFField::UnloadWidget(); } @@ -196,12 +197,10 @@ void CXFA_FFField::CapPlacement() { rtWidget.height); } else { pItem = pItem->GetFirst(); - pItem->GetRect(m_rtCaption); + m_rtCaption = pItem->GetRect(false); pItem = pItem->GetNext(); while (pItem) { - CFX_RectF rtRect; - pItem->GetRect(rtRect); - m_rtCaption.height += rtRect.Height(); + m_rtCaption.height += pItem->GetRect(false).Height(); pItem = pItem->GetNext(); } XFA_RectWidthoutMargin(m_rtCaption, mgWidget); |