fix spellchecker crash ; implement status info for read-only

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

diff --git a/ChangeLog b/ChangeLog
index 7f52c353939d8dfe73b7dfddfb76cd64fca3a5d5..6c62327506ab9a7165b6d9b92a4e858eacd1b23e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/lyxfunc.C (getStatus): handle LFUN_READ_ONLY_TOGGLE so that
+       it can be used as a menu entry
+
 2001-06-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * autogen.sh: remove kde stuff

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 20c156e02d1a54f7b994c48fbcbc6f9e70181325..034a28ddfbefde197599a97acaf8d18afa375a4a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ui/default.ui: add a (commented out) entry for read-only
+
 2001-06-12  Peter Suetterlin  <P.Suetterlin@astro.uu.nl>
 
        * examples/aa_head.lyx:

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 50f812e94c439451be3f4343401ebbe2dd14d975..99d3897bccb72cae55f31d4d6569f76678fbdb05 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -99,6 +99,7 @@ Menuset
        Item "Math Panel|l" "math-panel"
        Submenu "Math|M" "edit_math"
        Separator
+       #Item "Read Only" "buffer-toggle-read-only"
        Item "Spellchecker...|S" "spellchecker"
        Item "Check TeX|h" "buffer-chktex"
        Item "Remove All Error Boxes|E" "error-remove-all"

diff --git a/src/ChangeLog b/src/ChangeLog
index f9debfc791441f0decd6be1df324a299346209a8..429fdd6d7bcef361a93a942e3623355122d2ba48 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyxfunc.C (getStatus): support LFUN_READ_ONLY_TOGGLE
+
+       * text2.C (SetSelectionOverString): do not test str[i]==0 for end
+       of string
+
 2001-06-13  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * buffer.C (parseSingleLyXformat2Token): fix compatability reading

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 68b39a01fe47502167c026357dbd11ca9a17e929..6f6a4156a83e4f19cb35527467b992a151120d4b 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -521,6 +521,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac,
                        if (font.latex() == LyXFont::ON)
                                box = LyXFunc::ToggleOn;
                        break;
+               case LFUN_READ_ONLY_TOGGLE:
+                       if (buf->isReadonly())
+                               box = LyXFunc::ToggleOn;
+                       break;
                default:
                        box = LyXFunc::OK;
                        break;

diff --git a/src/text2.C b/src/text2.C
index ecfef3dfa78789d205ee4bbc727ed4a0a7632ccf..2f09f5194d479a7cc7b64a07d32d73e8d923211c 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1925,8 +1925,11 @@ LyXParagraph * LyXText::FirstParagraph() const
 // sets the selection over the number of characters of string, no check!!
 void LyXText::SetSelectionOverString(BufferView * bview, string const & str)
 {
+       if (str.empty())
+               return;
+       
        selection.cursor = cursor;
-       for (int i = 0; str[i]; ++i)
+       for (string::size_type i = 0; i < str.length(); ++i)
                CursorRight(bview);
        SetSelection(bview);
 }