diff options
| author | thestig <thestig@chromium.org> | 2016-05-12 21:56:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-12 21:56:43 -0700 |
| commit | 594b20b485046c954b68734e63e8d2c93fbe4ef5 (patch) | |
| tree | c20f6447c239d49848fea421fd497f23e41edbe3 /fpdfsdk/fxedit | |
| parent | f6d9a61af218b7acc1161ae231b16765ca10b526 (diff) | |
| download | pdfium-594b20b485046c954b68734e63e8d2c93fbe4ef5.tar.xz | |
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
Diffstat (limited to 'fpdfsdk/fxedit')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_list.cpp | 9 | ||||
| -rw-r--r-- | fpdfsdk/fxedit/fxet_pageobjs.cpp | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp index 639569898e..383b84f27f 100644 --- a/fpdfsdk/fxedit/fxet_list.cpp +++ b/fpdfsdk/fxedit/fxet_list.cpp @@ -63,12 +63,9 @@ FX_FLOAT CFX_ListItem::GetItemHeight() const { uint16_t CFX_ListItem::GetFirstChar() const { CPVT_Word word; - - if (IFX_Edit_Iterator* pIterator = GetIterator()) { - pIterator->SetAt(1); - pIterator->GetWord(word); - } - + IFX_Edit_Iterator* pIterator = GetIterator(); + pIterator->SetAt(1); + pIterator->GetWord(word); return word.Word; } diff --git a/fpdfsdk/fxedit/fxet_pageobjs.cpp b/fpdfsdk/fxedit/fxet_pageobjs.cpp index 6e7deed00d..1fe29af283 100644 --- a/fpdfsdk/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/fxedit/fxet_pageobjs.cpp @@ -183,7 +183,6 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, pIterator->SetAt(0); CPVT_WordPlace oldplace; - while (pIterator->NextWord()) { CPVT_WordPlace place = pIterator->GetAt(); if (pRange && place.WordCmp(pRange->EndPos) > 0) @@ -192,11 +191,7 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, if (wrSelect.IsExist()) { bSelect = place.WordCmp(wrSelect.BeginPos) > 0 && place.WordCmp(wrSelect.EndPos) <= 0; - if (bSelect) { - crCurFill = crWhite; - } else { - crCurFill = crTextFill; - } + crCurFill = bSelect ? crWhite : crTextFill; } if (pSystemHandler && pSystemHandler->IsSelectionImplemented()) { crCurFill = crTextFill; |