From ebd9146ddcb85f7ef73c20367fb9e82804635015 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 13 Mar 2002 23:13:35 +0000 Subject: [PATCH] use correct comparison git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3749 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/paragraph.C | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 81a2719a0a..70499354d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-03-14 Lars Gullik Bjønnes + + * paragraph.C (getFontSettings): compare >= not just > + (highestFontInRange): ditto + (setFont): ditto + 2002-03-13 Lars Gullik Bjønnes * paragraph.C: change several algorithm to be more appripriate for diff --git a/src/paragraph.C b/src/paragraph.C index 159b82ef91..29006e1dde 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -595,7 +595,7 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); Pimpl::FontList::const_iterator end = pimpl_->fontlist.end(); for (; cit != end; ++cit) { - if (cit->pos() > pos) + if (cit->pos() >= pos) break; } @@ -695,7 +695,7 @@ Paragraph::highestFontInRange(pos_type startpos, pos_type endpos, Pimpl::FontList::const_iterator end_it = pimpl_->fontlist.begin(); Pimpl::FontList::const_iterator end = pimpl_->fontlist.end(); for (; end_it != end; ++end_it) { - if (end_it->pos() > endpos) + if (end_it->pos() >= endpos) break; } @@ -704,7 +704,7 @@ Paragraph::highestFontInRange(pos_type startpos, pos_type endpos, Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); for (; cit != end; ++cit) { - if (cit->pos() > startpos) + if (cit->pos() >= startpos) break; } @@ -776,7 +776,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) Pimpl::FontList::iterator it = beg; Pimpl::FontList::iterator endit = pimpl_->fontlist.end(); for (; it != endit; ++it) { - if (it->pos() > pos) + if (it->pos() >= pos) break; } unsigned int i = std::distance(beg, it); -- 2.39.2