From b353f8c32b2d17cbea5ace6eb5f7edb8663e37be Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Oct 2018 18:39:14 +0000 Subject: Use pdfium::Optional in CPDFSDK_Widget. Also make some methods const. Change-Id: Ie2d0f7e691ad9448b4e77227ce3c0b2b065e0da0 Reviewed-on: https://pdfium-review.googlesource.com/c/43602 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fpdfsdk/formfiller/cffl_formfiller.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/formfiller') diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 4b94bde271..94d80cae01 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -340,16 +340,18 @@ CPWL_Wnd::CreateParams CFFL_FormFiller::GetCreateParam() { if (dwFieldFlag & FIELDFLAG_READONLY) dwCreateFlags |= PWS_READONLY; - FX_COLORREF color; - if (m_pWidget->GetFillColor(color)) - cp.sBackgroundColor = CFX_Color(color); - if (m_pWidget->GetBorderColor(color)) - cp.sBorderColor = CFX_Color(color); + Optional color = m_pWidget->GetFillColor(); + if (color.has_value()) + cp.sBackgroundColor = CFX_Color(color.value()); + color = m_pWidget->GetBorderColor(); + if (color.has_value()) + cp.sBorderColor = CFX_Color(color.value()); cp.sTextColor = CFX_Color(CFX_Color::kGray, 0); - if (m_pWidget->GetTextColor(color)) - cp.sTextColor = CFX_Color(color); + color = m_pWidget->GetTextColor(); + if (color.has_value()) + cp.sTextColor = CFX_Color(color.value()); cp.fFontSize = m_pWidget->GetFontSize(); cp.dwBorderWidth = m_pWidget->GetBorderWidth(); -- cgit v1.2.3