* lyx2lyx/lyx_1_5.py:

- fix bug 6018.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30645 a592a061-630c-0410-9148-cb99ea01b6c8

lib/lyx2lyx/lyx_1_5.py

@@ -1597,7 +1597,7 @@ def revert_graphics_rotation(document):
 
 
 def convert_tableborder(document):
-    # The problematic is: LyX double the table cell border as it ignores the "|" character in
+    # The problem is: LyX doubles the table cell border as it ignores the "|" character in
     # the cell arguments. A fix takes care of this and therefore the "|" has to be removed
     i = 0
     while i < len(document.body):
@@ -1606,7 +1606,7 @@ def convert_tableborder(document):
         # the two tokens have to be in one line
         if (h != -1 and k != -1):
             # delete the "|"
-            document.body[i] = document.body[i][:k] + document.body[i][k+1:len(document.body[i])-1]
+            document.body[i] = document.body[i][:k] + document.body[i][k+1:len(document.body[i])]
         i = i + 1
 
 

status.16x

@@ -72,8 +72,6 @@ What's new
 
 - Reverse searching added to the merge changes dialog (bug 2213).
 
-- Fall back to default UI file if the specified one cannot be found (bug 6076).
-
 
 * DOCUMENTATION AND LOCALIZATION
 
@@ -112,6 +110,9 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
+- Fix conversion documents from LyX 1.4 which have multicolumn cells in
+  tabulars with expert border settings (bug 6018).
+
 - Fix output of alignment if default aligment is not justified (bug 5995).
 
 - Fix problem where updates in some child documents were not recognized
@@ -139,6 +140,9 @@ What's new
 
 - Fix bookmark navigation crash when multiple windows are used
   (bug 6000).
+  
+- Fall back to default UI file if the specified one cannot be found
+  (bug 6076).
 
 - Fix assertion when a nested math hull appears in a math macro
   (bug 5996).