X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontList.cpp;h=ba6b79af05bc2738f67ac809984a6a1b72d5fd86;hb=10be0c43f20a27a1e6af82241ad5ec6b5cad3eca;hp=0c38c03e5d957f9f2987640043087ec7286df07f;hpb=e1eaea3b4db3662038b4f8a3129e93642fe28431;p=lyx.git diff --git a/src/FontList.cpp b/src/FontList.cpp index 0c38c03e5d..ba6b79af05 100644 --- a/src/FontList.cpp +++ b/src/FontList.cpp @@ -4,13 +4,13 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Dekel Tsur - * \author Jürgen Vigna + * \author Jürgen Vigna * \author Abdelrazak Younes * * Full author contact details are available in file CREDITS. @@ -53,13 +53,14 @@ FontList::const_iterator FontList::fontIterator(pos_type pos) const } -Font & FontList::get(pos_type pos) +Font const & FontList::get(pos_type pos) { iterator end = list_.end(); iterator it = fontIterator(pos); if (it != end && it->pos() == pos) return it->font_; - static Font dummy; + + static Font const dummy; return dummy; } @@ -143,7 +144,7 @@ void FontList::set(pos_type pos, Font const & font) bool const end = found && list_[i].pos() == pos; if (!begin && !end) { - // The general case: The block is splitted into 3 blocks + // The general case: The block is split into 3 blocks list_.insert(list_.begin() + i, FontTable(pos - 1, list_[i].font())); list_.insert(list_.begin() + i + 1,