Remove unneeded code and comment.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21241 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/FontInfo.h b/src/FontInfo.h
index dd8f81a9956a68a25351b8f994255da1d44585c1..f71bc43eae79eb8f5690ad51b9be49a4f0bec7f2 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -92,7 +92,7 @@ public:
        ColorCode realColor() const;
 
        /// Converts logical attributes to concrete shape attribute
-       // Try hard to inline this as it shows up with 4.6 % in the profiler.
+       /// Try hard to inline this as it shows up with 4.6 % in the profiler.
        FontShape realShape() const
        {
                if (noun_ == FONT_ON)
@@ -119,22 +119,6 @@ public:
                }
        }
 
-       /*
-       FontInfo & operator=(FontInfo const & rhs)
-       {
-               family_ = rhs.family_;
-               series_ = rhs.series_;
-               shape_ = rhs.shape_;
-               size_ = rhs.size_;
-               color_ = rhs.color_;
-               background_ = rhs.background_;
-               emph_ = rhs.emph_;
-               underbar_ = rhs.underbar_;
-               noun_ = rhs.noun_;
-               number_ = rhs.number_;
-       }
-       */
-
 private:
        friend bool operator==(FontInfo const & lhs, FontInfo const & rhs);
 

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index c2ed3cf094617e9e53578ca2c460990fab85bd7d..ff03e6214e8478cdcc604ad1b5b526218f442b5c 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -163,7 +163,7 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
        save_ = mb;
        FontSize oldsize = save_.font.size();
        mb.fontname = name;
-       mb.font = FontInfo();
+       mb.font = sane_font;
        augmentFont(mb.font, from_ascii(name));
        mb.font.setSize(oldsize);
 }
@@ -175,7 +175,7 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name)
        save_ = mb;
        FontSize oldsize = save_.font.size();
        mb.fontname = to_utf8(name);
-       mb.font = FontInfo();
+       mb.font = sane_font;
        augmentFont(mb.font, name);
        mb.font.setSize(oldsize);
 }