Add outline-in/out/up/down to the outline context menu.

[lyx.git] / src / FontInfo.cpp

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 743f6b6325014788145cecedd4257c617e0880ff..00a9da165dfe538b817d5a2aaf979326f1c071ac 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -3,10 +3,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
  *
  * Full author contact details are available in file CREDITS.
@@ -18,10 +18,7 @@
 
 #include "support/debug.h"
 
-#include <ostream>
-
-using std::endl;
-
+using namespace std;
 
 namespace lyx {
 
@@ -82,16 +79,16 @@ FontInfo & FontInfo::decSize()
        case FONT_SIZE_SCRIPT:       size_ = FONT_SIZE_TINY;     break;
        case FONT_SIZE_TINY:         break;
        case FONT_SIZE_INCREASE:
-               lyxerr << "Can't FontInfo::decSize on FONT_SIZE_INCREASE" << endl;
+               LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INCREASE");
                break;
        case FONT_SIZE_DECREASE:
-               lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_DECREASE" << endl;
+               LYXERR0("Can't FontInfo::decSize on FONT_SIZE_DECREASE");
                break;
        case FONT_SIZE_INHERIT:
-               lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_INHERIT" << endl;
+               LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INHERIT");
                break;
        case FONT_SIZE_IGNORE:
-               lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_IGNORE" << endl;
+               LYXERR0("Can't FontInfo::decSize on FONT_SIZE_IGNORE");
                break;
        }
        return *this;
@@ -113,16 +110,16 @@ FontInfo & FontInfo::incSize()
        case FONT_SIZE_SCRIPT:       size_ = FONT_SIZE_FOOTNOTE; break;
        case FONT_SIZE_TINY:         size_ = FONT_SIZE_SCRIPT;   break;
        case FONT_SIZE_INCREASE:
-               lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INCREASE" << endl;
+               LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INCREASE");
                break;
        case FONT_SIZE_DECREASE:
-               lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_DECREASE" << endl;
+               LYXERR0("Can't FontInfo::incSize on FONT_SIZE_DECREASE");
                break;
        case FONT_SIZE_INHERIT:
-               lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INHERIT" << endl;
+               LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INHERIT");
                break;
        case FONT_SIZE_IGNORE:
-               lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_IGNORE" << endl;
+               LYXERR0("Can't FontInfo::incSize on FONT_SIZE_IGNORE");
                break;
        }
        return *this;
@@ -281,8 +278,10 @@ bool FontInfo::resolved() const
 }
 
 
-ColorCode FontInfo::realColor() const
+Color FontInfo::realColor() const
 {
+       if (paint_color_ != Color_none)
+               return paint_color_;
        if (color_ == Color_none)
                return Color_foreground;
        return color_;