fix bug 2131

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index fb21555129bf8539a9787ff8c5359dd1dc6d1ce1..7e75f48aa5faef782f66d6da4e1baaa99a121ac0 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-20  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * lyx_1_4.py (convert_frameless_box): fix file format argument of
+       insert_ert
+
 2005-10-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * LyX.py: enlarge range to current format (245);

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 9594c9a33e6882cf72f83ff2db7953deb0760e29..3739e5547bf1634a1e0fd8f37ea22f66655065f4 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1557,7 +1557,7 @@ def convert_frameless_box(file):
             ert = ert + '\\let\\endminipage\\endlyxtolyxminipage%\n'
 
             old_i = i
-            i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
             j = j + i - old_i - 1
 
             file.body[i:i] = ['\\begin_inset Minipage',
@@ -1578,7 +1578,7 @@ def convert_frameless_box(file):
             ert = '\\let\\minipage\\lyxtolyxrealminipage%\n'
             ert = ert + '\\let\\endminipage\\lyxtolyxrealendminipage%'
             old_i = i
-            i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
             j = j + i - old_i - 1
 
             # Redefine the minipage end before the inset end.
@@ -1586,7 +1586,7 @@ def convert_frameless_box(file):
             file.body[j:j] = ['\\layout Standard', '', '']
             j = j + 2
             ert = '\\let\\endminipage\\endlyxtolyxminipage'
-            j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
            j = j + 1
             file.body.insert(j, '')
            j = j + 1
@@ -1597,7 +1597,7 @@ def convert_frameless_box(file):
                 ert = '}%\n'
             else:
                 ert = '\\end{lyxtolyxrealminipage}%\n'
-            j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
 
             # We don't need to restore the original minipage after the inset
             # end because the scope of the redefinition is the original box.