Herbert's patch, part 1

[lyx.git] / src / Painter.C

diff --git a/src/Painter.C b/src/Painter.C
index d32451ea4c4733013c0fdb1d93f28b43299655f6..6c0b271bfe2d82aaea56d72b67bca0e12ecbab7c 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -332,12 +332,11 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                        }
                }
        }
-       if (f.underbar() == LyXFont::ON
-#ifndef NO_LATEX
-           && f.latex() != LyXFont::ON
-#endif
-               )
+
+       if (f.underbar() == LyXFont::ON) {
                underline(f, x, y, lyxfont::width(s, ls, f));
+       }
+       
        return *this;
 }
 
@@ -375,12 +374,11 @@ PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
                        }
                }
        }
-       if (f.underbar() == LyXFont::ON
-#ifndef NO_LATEX
-           && f.latex() != LyXFont::ON
-#endif
-               )
+       
+       if (f.underbar() == LyXFont::ON) {
                underline(f, x, y, lyxfont::width(s, ls, f));
+       }
+       
        return *this;
 }