On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiCharacter.cpp

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 53ca720d2f2ac129451d935ffa76fa5d8bd1ff3c..2d2c3e2b7ef679001320285b3a2fb88ed652685a 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -160,7 +160,7 @@ void fillCombo(QComboBox * combo, QList<T> const & list)
 
 GuiCharacter::GuiCharacter(GuiView & lv)
        : GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font, ignore_language),
-         toggleall_(false), reset_lang_(false)
+         toggleall_(false)
 {
        setupUi(this);
 
@@ -307,30 +307,38 @@ static void setBar(FontInfo & fi, FontState val)
                fi.setEmph(FONT_IGNORE);
                fi.setUnderbar(FONT_IGNORE);
                fi.setStrikeout(FONT_IGNORE);
+               fi.setUuline(FONT_IGNORE);
+               fi.setUwave(FONT_IGNORE);
                fi.setNoun(FONT_IGNORE);
                break;
 
        case EMPH_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setEmph(FONT_TOGGLE);
                break;
 
        case UNDERBAR_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUnderbar(FONT_TOGGLE);
                break;
 
        case STRIKEOUT_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setStrikeout(FONT_TOGGLE);
                break;
 
        case UULINE_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUuline(FONT_TOGGLE);
                break;
 
        case UWAVE_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUwave(FONT_TOGGLE);
                break;
 
        case NOUN_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setNoun(FONT_TOGGLE);
                break;