X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontList.cpp;h=ba6b79af05bc2738f67ac809984a6a1b72d5fd86;hb=10be0c43f20a27a1e6af82241ad5ec6b5cad3eca;hp=afa7894ce9639067ad02a4dd3a51f4d570f42040;hpb=dec437fbac739fb4d8e78842b9f9286bbaaf0971;p=lyx.git

diff --git a/src/FontList.cpp b/src/FontList.cpp
index afa7894ce9..ba6b79af05 100644
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -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,