From 594b20b485046c954b68734e63e8d2c93fbe4ef5 Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 12 May 2016 21:56:43 -0700 Subject: Fix some misc nits. These were left over from after I broke a big "things that never return NULL" CL up into smaller ones. Review-Url: https://codereview.chromium.org/1960043003 --- fpdfsdk/fsdk_baseform.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/fsdk_baseform.cpp') diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp index 46e9c46fb1..177e7de978 100644 --- a/fpdfsdk/fsdk_baseform.cpp +++ b/fpdfsdk/fsdk_baseform.cpp @@ -1434,10 +1434,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { FX_FLOAT fFontSize = GetFontSize(); - if (IsFloatZero(fFontSize)) - pEdit->SetFontSize(12.0f); - else - pEdit->SetFontSize(fFontSize); + pEdit->SetFontSize(IsFloatZero(fFontSize) ? 12.0f : fFontSize); pEdit->Initialize(); @@ -1448,11 +1445,11 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { int32_t nCount = pField->CountOptions(); int32_t nSelCount = pField->CountSelectedItems(); - for (int32_t i = nTop; i < nCount; i++) { - FX_BOOL bSelected = FALSE; - for (int32_t j = 0; j < nSelCount; j++) { + for (int32_t i = nTop; i < nCount; ++i) { + bool bSelected = false; + for (int32_t j = 0; j < nSelCount; ++j) { if (pField->GetSelectedIndex(j) == i) { - bSelected = TRUE; + bSelected = true; break; } } @@ -1609,7 +1606,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(), FALSE) << " 2 J 0 j\n"; - for (int32_t i = 1; i < nMaxLen; i++) { + for (int32_t i = 1; i < nMaxLen; ++i) { sLines << rcClient.left + ((rcClient.right - rcClient.left) / nMaxLen) * i << " " << rcClient.bottom << " m\n" @@ -1633,7 +1630,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { << "[" << dsBorder.nDash << " " << dsBorder.nGap << "] " << dsBorder.nPhase << " d\n"; - for (int32_t i = 1; i < nMaxLen; i++) { + for (int32_t i = 1; i < nMaxLen; ++i) { sLines << rcClient.left + ((rcClient.right - rcClient.left) / nMaxLen) * i << " " << rcClient.bottom << " m\n" -- cgit v1.2.3