From 6312bf94bb44e2edeb855008da0921c13103f66a Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 2 May 2018 21:14:27 +0000 Subject: Use pointer instead of ref for XFA_RectWithoutMargin param. Removed many null checks since XFA_RectWithoutMargin already checks if the margin is null internally. Change-Id: I21f5101fe38559eb02f4c3aaf081ff29ce293e47 Reviewed-on: https://pdfium-review.googlesource.com/31993 Commit-Queue: Henrique Nakashima Commit-Queue: Ryan Harrison Reviewed-by: Ryan Harrison --- xfa/fxfa/cxfa_ffpushbutton.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_ffpushbutton.cpp') diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index 7c556b81a8..a40b1ef1f1 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -102,15 +102,13 @@ bool CXFA_FFPushButton::PerformLayout() { m_rtUI = rtWidget; CXFA_Margin* margin = m_pNode->GetMarginIfExists(); - if (margin) - XFA_RectWithoutMargin(rtWidget, margin); + XFA_RectWithoutMargin(&rtWidget, margin); m_rtCaption = rtWidget; CXFA_Caption* caption = m_pNode->GetCaptionIfExists(); CXFA_Margin* captionMargin = caption ? caption->GetMarginIfExists() : nullptr; - if (captionMargin) - XFA_RectWithoutMargin(m_rtCaption, captionMargin); + XFA_RectWithoutMargin(&m_rtCaption, captionMargin); LayoutHighlightCaption(); SetFWLRect(); -- cgit v1.2.3