John's character.C patch (bug fix).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2604 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index d42ca761aa20f2993768954c32b93fc8c10b1fd1..1ee008585880e62a1d83ed2caee14f1b3c31b84f 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-26  John Levon  <moz@compsoc.man.ac.uk>
+
+       * character.C (getBarData): fix bar array.
+
 2001-08-15  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * ControlInset.h (apply): tentative fix for the press Apply multiple

diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C
index 81682d8b6b3c0a0dabcc3c611b9fcfa0b3fc3270..722fa724798b1f33e0397fbdbc0b47070ddf7a45 100644 (file)
--- a/src/frontends/controllers/character.C
+++ b/src/frontends/controllers/character.C
@@ -126,7 +126,7 @@ vector<SizePair> const getSizeData()
 
 vector<BarPair> const getBarData()
 {
-       vector<BarPair> bar(6);
+       vector<BarPair> bar(5);
 
        BarPair pr;
        pr.first = _("No change");  pr.second = IGNORE;
@@ -138,7 +138,7 @@ vector<BarPair> const getBarData()
        pr.first = _("Noun");       pr.second = NOUN_TOGGLE;
        bar[3] = pr;
        pr.first = _("Reset");      pr.second = INHERIT;
-       bar[5] = pr;
+       bar[4] = pr;
        
        return bar;
 }