2 more patches from Dekel

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

diff --git a/ChangeLog b/ChangeLog
index fb7ef81bd17aaecb6e90a79b7609c554aa3197bb..ace18ffe36e7b47e37f7c123fb83c3ab0905dc49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2000-05-31 Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * src/lyxrc.C (read): Add a missing break in the switch
+
 2000-05-30 Dekel Tsur  <dekel@math.tau.ac.il>
 
+       * src/text2.C (InsertStringA): Fix a bug with insertion into table
+       
        * src/trans_mgr.C (insertVerbatim): Do not use insetquote when the
        text is Hebrew.
                              

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 28a2bdb7003db3e73a1eb33a5be203cc50bcddc0..f34e0cdb6436164f0794b9089363092bcc8a7128 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1017,6 +1017,7 @@ int LyXRC::read(string const & filename)
                case RC_MARK_FOREIGN_LANGUAGE:
                        if (lexrc.next())
                                mark_foreign_language = lexrc.GetBool();
+                       break;
                case RC_SHOW_BANNER:
                        if (lexrc.next())
                                show_banner = lexrc.GetBool();

diff --git a/src/text2.C b/src/text2.C
index e0ed5616ba5da9006e640489aa70ee806e7159f2..adc55916568f2f4a05fd5f034fcb145701a19fb3 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -2869,8 +2869,9 @@ void LyXText::InsertStringA(string const & str)
                        }
                } else {
                         if (par->table) {
-                                if (i + 1 >= str.length()) {
-                                        ++pos;
+                                if ((i + 1) >= str.length()) {
+                                       if (pos < par->size())
+                                               ++pos;
                                         break;
                                 }
                                 while((pos < par->size()) &&