Further amendment to 72a488d7

[lyx.git] / src / FontInfo.cpp

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 67255c29d4006c4b2528348dca0d37162f87fae6..be792623071b74fb36f9f7bb9383b49bf65e6bd1 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -25,6 +25,7 @@
 #include "support/lstrings.h"
 #include "support/RefChanger.h"
 
+#include <algorithm>
 #include <ostream>
 #include <sstream>
 
@@ -271,29 +272,29 @@ FontInfo & FontInfo::realize(FontInfo const & tmplt)
 }
 
 
-Changer FontInfo::changeColor(ColorCode const color, bool cond)
+Changer FontInfo::changeColor(ColorCode const color)
 {
-       return make_change(color_, color, cond);
+       return make_change(color_, color);
 }
 
 
-Changer FontInfo::changeShape(FontShape const shape, bool cond)
+Changer FontInfo::changeShape(FontShape const shape)
 {
-       return make_change(shape_, shape, cond);
+       return make_change(shape_, shape);
 }
 
 
-Changer FontInfo::changeStyle(MathStyle const new_style, bool cond)
+Changer FontInfo::changeStyle(MathStyle const new_style)
 {
-       return make_change(style_, new_style, cond);
+       return make_change(style_, new_style);
 }
 
 
-Changer FontInfo::change(FontInfo font, bool realiz, bool cond)
+Changer FontInfo::change(FontInfo font, bool realiz)
 {
        if (realiz)
                font.realize(*this);
-       return make_change(*this, font, cond);
+       return make_change(*this, font);
 }