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 0ee6e29f7e10b2f7be8bbd9a58c78aa5804518bb..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.
@@ -278,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_;